[Mesa-dev] [PATCH 2/3] gallium/osmesa: Always link with the c++ linker.

[Jon Severinsson]

Just like all other gallium targets...

CC: "9.2" <mesa-stable at lists.freedesktop.org>
---
 src/gallium/targets/osmesa/Makefile.am |   11 ++---------
 1 fil ändrad, 2 tillägg(+), 9 borttagningar(-)

diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
index de78d8cc..25fee6f4 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
 
 
-- 
1.7.10.4