Mesa (master): Use only native engine & bitwriter LLVM libraries for linking.

[Jose Fonseca]

Module: Mesa
Branch: master
Commit: 25ee5a27f30aaeb83232de9bada82534d2d504fc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=25ee5a27f30aaeb83232de9bada82534d2d504fc

Author: ojab <ojab at ojab.ru>
Date:   Mon Jan 30 12:34:46 2012 +0400

Use only native engine & bitwriter LLVM libraries for linking.

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

---

 configure.ac  |    2 +-
 scons/llvm.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 06d400f..df9f880 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 57fe922..916b040 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