Merge branch 'mesa_7_5_branch'

[mesa.git] / configs / linux-llvm

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 44e200e8565cee208220a5df1a6c97fc5e48a9b3..e7ecd826d5310db1a8d10c5143e5ac5e38f4e015 100644 (file)
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -22,13 +22,14 @@ endif
 
 ifeq ($(MESA_LLVM),1)
 #  LLVM_CFLAGS=`llvm-config --cflags`
-  LLVM_CXXFLAGS=`llvm-config --cxxflags` -Wno-long-long
-  LLVM_LDFLAGS=`llvm-config --ldflags`
-  LLVM_LIBS=`llvm-config --libs`
+  LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo interpreter instrumentation` -Wno-long-long
+  LLVM_LDFLAGS=`llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation`
+  LLVM_LIBS=`llvm-config --libs backend bitreader engine ipo interpreter instrumentation`
   MKLIB_OPTIONS=-cplusplus
 else
   LLVM_CFLAGS=
   LLVM_CXXFLAGS=
 endif
 
-GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread
+LD = g++
+GL_LIB_DEPS = $(LLVM_LDFLAGS) $(LLVM_LIBS) $(EXTRA_LIB_PATH) -lX11 -lXext -lm -lpthread -lstdc++