Mesa (master): libgl-xlib/build: Link with C++ when LLVM is used

[Matt Turner]

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

Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Jan 23 12:45:40 2013 -0800

libgl-xlib/build: Link with C++ when LLVM is used

Also link-in libX11 and libXext.

Tested-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/targets/libgl-xlib/Makefile.am |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
index 5889a87..cca0da4 100644
--- a/src/gallium/targets/libgl-xlib/Makefile.am
+++ b/src/gallium/targets/libgl-xlib/Makefile.am
@@ -54,13 +54,21 @@ libGL_la_LIBADD = \
 	$(top_builddir)/src/mapi/glapi/libglapi.la \
 	$(top_builddir)/src/mesa/libmesagallium.la \
 	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
-	$(PTHREAD_LIBS) \
+	$(GL_LIB_DEPS) \
 	$(CLOCK_LIB)
 
 if HAVE_MESA_LLVM
+libGL_la_LINK = $(CXXLINK) $(libGL_la_LDFLAGS)
+# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
+nodist_EXTRA_libGL_la_SOURCES = dummy-cpp.cpp
+
 libGL_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
 AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
 libGL_la_LDFLAGS += $(LLVM_LDFLAGS)
+else
+libGL_la_LINK = $(CXXLINK) $(libGL_la_LDFLAGS)
+# Mention a dummy pure C file to trigger generation of the $(LINK) variable
+nodist_EXTRA_libGL_la_SOURCES = dummy-c.c
 endif
 
 # Provide compatibility with scripts for the old Mesa build system for