targets/dri-r600: Force c++ linker in all cases

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59282

diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/dri-r600/Makefile.am
index a3dbcde8925c8e276c99bf736436c220016b7f9f..ed8475b6892e4ec15e3bceb7e5f0eea7b9886ca2 100644 (file)
--- a/src/gallium/targets/dri-r600/Makefile.am
+++ b/src/gallium/targets/dri-r600/Makefile.am
@@ -59,17 +59,11 @@ r600_dri_la_LIBADD = \
        $(LIBDRM_LIBS) \
        $(RADEON_LIBS)
 
-if HAVE_MESA_LLVM
-r600_dri_la_LINK = $(CXXLINK) $(r600_dri_la_LDFLAGS)
-# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
-nodist_EXTRA_r600_dri_la_SOURCES = dummy-cpp.cpp
+nodist_EXTRA_r600_dri_la_SOURCES = dummy.cpp
 
+if HAVE_MESA_LLVM
 r600_dri_la_LDFLAGS += $(LLVM_LDFLAGS)
 r600_dri_la_LIBADD += $(LLVM_LIBS)
-else
-r600_dri_la_LINK = $(LINK) $(r600_dri_la_LDFLAGS)
-# Mention a dummy pure C file to trigger generation of the $(LINK) variable
-nodist_EXTRA_r600_dri_la_SOURCES = dummy-c.c
 endif
 
 # Provide compatibility with scripts for the old Mesa build system for