From: Matt Turner <mattst88@gmail.com>
Date: Wed, 23 Jan 2013 20:45:40 +0000 (-0800)
Subject: libgl-xlib/build: Link with C++ when LLVM is used
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0412864ae83c0a73b611c81611643994076d503c;p=mesa.git

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

Also link-in libX11 and libXext.

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

diff --git a/src/gallium/targets/libgl-xlib/Makefile.am b/src/gallium/targets/libgl-xlib/Makefile.am
index 5889a8739de..cca0da48bec 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