Mesa (9.2): gallium/osmesa: Always link with the c++ linker.

[Ian Romanick]

Module: Mesa
Branch: 9.2
Commit: dda7358377947234800fd3324ff2172f81109337
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=dda7358377947234800fd3324ff2172f81109337

Author: Jon Severinsson <jon at severinsson.net>
Date:   Fri Aug 23 11:19:00 2013 +0200

gallium/osmesa: Always link with the c++ linker.

Just like all other gallium targets...

CC: "9.2" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Matt Turner <mattst88 at gmail.com>
(cherry picked from commit aeb9c9e4b01af8a70432a961931abde5adf06c42)

---

 src/gallium/targets/osmesa/Makefile.am |   11 ++---------
 1 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
index de78d8c..25fee6f 100644
--- a/src/gallium/targets/osmesa/Makefile.am
+++ b/src/gallium/targets/osmesa/Makefile.am
@@ -57,19 +57,12 @@ lib at OSMESA_LIB@_la_LIBADD = \
 	$(CLOCK_LIB)
 
 
+nodist_EXTRA_lib at OSMESA_LIB@_la_SOURCES = dummy.cpp
 
 if HAVE_MESA_LLVM
-lib at OSMESA_LIB@_la_LINK = $(CXXLINK) $(lib at OSMESA_LIB@_la_LDFLAGS)
-# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
-nodist_EXTRA_lib at OSMESA_LIB@_la_SOURCES = dummy-cpp.cpp
-
-lib at OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
 AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
 lib at OSMESA_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS)
-else
-lib at OSMESA_LIB@_la_LINK = $(CXXLINK) $(lib at OSMESA_LIB@_la_LDFLAGS)
-# Mention a dummy pure C file to trigger generation of the $(LINK) variable
-nodist_EXTRA_lib at OSMESA_LIB@_la_SOURCES = dummy-c.c
+lib at OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
 endif