gallivm: Explicitly specify the LLVM components we need.

diff --git a/SConstruct b/SConstruct
index 8c96817daefc04264a0a2863f2d1a02b9577272b..baa0f9069b3523a5e2b71bd54ffb7b8d2714a38e 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -133,7 +133,7 @@ if dri:
 # LLVM
 if llvm:
        # See also http://www.scons.org/wiki/UsingPkgConfig
-       env.ParseConfig('llvm-config --cflags --ldflags --libs')
+       env.ParseConfig('llvm-config --cflags --ldflags --libs backend bitreader engine ipo')
        env.Append(CPPDEFINES = ['MESA_LLVM'])
         # Force C++ linkage
        env['LINK'] = env['CXX']

diff --git a/configs/linux-llvm b/configs/linux-llvm
index 489cfd0546aa43e48eceb7d403ba70e54cf36c43..a9d740574cfed12ce642e020e47e3b0385863dd3 100644 (file)
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -22,9 +22,9 @@ 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` -Wno-long-long
+  LLVM_LDFLAGS=`llvm-config --ldflags backend bitreader engine ipo`
+  LLVM_LIBS=`llvm-config --libs backend bitreader engine ipo`
   MKLIB_OPTIONS=-cplusplus
 else
   LLVM_CFLAGS=