summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorojab <[email protected]>2012-01-30 12:34:46 +0400
committerJosé Fonseca <[email protected]>2012-01-30 18:51:59 +0000
commit25ee5a27f30aaeb83232de9bada82534d2d504fc (patch)
tree5d3b0193d4a95f4f75b31da4dbe8ba819c7e1028
parentbc2875aa483a0fef7f6e32c1886f6e2edaba7694 (diff)
Use only native engine & bitwriter LLVM libraries for linking.
Signed-off-by: José Fonseca <[email protected]>
-rw-r--r--configure.ac2
-rw-r--r--scons/llvm.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 06d400f159e..df9f88049c7 100644
--- 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 57fe922d0ae..916b040b0f4 100644
--- 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