summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Severinsson <jon@severinsson.net>2013-08-23 11:19:00 +0200
committerMatt Turner <mattst88@gmail.com>2013-08-23 12:58:45 -0700
commitaeb9c9e4b01af8a70432a961931abde5adf06c42 (patch)
tree4b0e583a45821b2dd9dda34c7cd7eff7d5fb33c4
parentc8111904304a878a3d5831b453255f04e1ddcf56 (diff)
gallium/osmesa: Always link with the c++ linker.
Just like all other gallium targets... CC: "9.2" <mesa-stable@lists.freedesktop.org> Reviewed-by: Matt Turner <mattst88@gmail.com>
-rw-r--r--src/gallium/targets/osmesa/Makefile.am11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/gallium/targets/osmesa/Makefile.am b/src/gallium/targets/osmesa/Makefile.am
index de78d8cc0f3..25fee6f41a5 100644
--- a/src/gallium/targets/osmesa/Makefile.am
+++ b/src/gallium/targets/osmesa/Makefile.am
@@ -57,19 +57,12 @@ lib@OSMESA_LIB@_la_LIBADD = \
$(CLOCK_LIB)
+nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy.cpp
if HAVE_MESA_LLVM
-lib@OSMESA_LIB@_la_LINK = $(CXXLINK) $(lib@OSMESA_LIB@_la_LDFLAGS)
-# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
-nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy-cpp.cpp
-
-lib@OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
lib@OSMESA_LIB@_la_LDFLAGS += $(LLVM_LDFLAGS)
-else
-lib@OSMESA_LIB@_la_LINK = $(CXXLINK) $(lib@OSMESA_LIB@_la_LDFLAGS)
-# Mention a dummy pure C file to trigger generation of the $(LINK) variable
-nodist_EXTRA_lib@OSMESA_LIB@_la_SOURCES = dummy-c.c
+lib@OSMESA_LIB@_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
endif