Use only native engine & bitwriter LLVM libraries for linking.

Signed-off-by: José Fonseca <jfonseca@vmware.com>

diff --git a/configure.ac b/configure.ac
index 06d400f159ec9d94f377eb01501e26bce11745e6..df9f88049c7d05b9eacd2faf72fd68eba5daf6c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1747,7 +1747,7 @@ if test "x$enable_gallium_llvm" = xyes; then
     if test "x$LLVM_CONFIG" != xno; then
        LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'`
        LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed -e 's/-DNDEBUG\>//g' -e 's/-pedantic//g'`
-       LLVM_LIBS="`$LLVM_CONFIG --libs`"
+       LLVM_LIBS="`$LLVM_CONFIG --libs engine bitwriter`"
 
        LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
        DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS"

diff --git a/scons/llvm.py b/scons/llvm.py
index 57fe922d0ae65e3ed65b57ad7c52b8a39978b911..916b040b0f462eab315ad6b0ae3fd49f5b88241f 100644 (file)
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -166,7 +166,7 @@ def generate(env):
                 pass
             env.MergeFlags(cppflags)
 
-            env.ParseConfig('llvm-config --libs')
+            env.ParseConfig('llvm-config --libs engine bitwriter')
             env.ParseConfig('llvm-config --ldflags')
         except OSError:
             print 'scons: llvm-config version %s failed' % llvm_version