Mesa (master): targets/dri-r600: Force c++ linker in all cases

[Andreas Boll]

Module: Mesa
Branch: master
Commit: 9da454f295062500ebb868e31eebcd5f753f83ff
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9da454f295062500ebb868e31eebcd5f753f83ff

Author: Andreas Boll <andreas.boll.dev at gmail.com>
Date:   Sat Jan 12 21:13:23 2013 +0100

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

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

---

 src/gallium/targets/dri-r600/Makefile.am |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/gallium/targets/dri-r600/Makefile.am b/src/gallium/targets/dri-r600/Makefile.am
index a3dbcde..ed8475b 100644
--- 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