Mesa (master): autoconf/make: Don't specify individual llvm libraries.

[Jose Fonseca]

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

Author: José Fonseca <jfonseca at vmware.com>
Date:   Mon Mar 14 19:58:22 2011 +0000

autoconf/make: Don't specify individual llvm libraries.

We need more and more of these, and it is difficult and prone to version
incompatability issues trying to single out every one of them.

This mimicks what was done in SCons.

---

 configs/linux-llvm |    6 +++---
 configure.ac       |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/linux-llvm b/configs/linux-llvm
index dde40a3..359bee2 100644
--- a/configs/linux-llvm
+++ b/configs/linux-llvm
@@ -31,9 +31,9 @@ endif
 
 ifeq ($(MESA_LLVM),1)
   LLVM_CFLAGS=`llvm-config --cppflags`
-  LLVM_CXXFLAGS=`llvm-config --cxxflags backend bitreader engine ipo interpreter instrumentation` -Wno-long-long
-  LLVM_LDFLAGS = $(shell llvm-config --ldflags backend bitreader engine ipo interpreter instrumentation)
-  LLVM_LIBS = $(shell llvm-config --libs backend bitwriter bitreader engine ipo interpreter instrumentation)
+  LLVM_CXXFLAGS=`llvm-config --cxxflags` -Wno-long-long
+  LLVM_LDFLAGS = $(shell llvm-config --ldflags)
+  LLVM_LIBS = $(shell llvm-config --libs)
   MKLIB_OPTIONS=-cplusplus
 else
   LLVM_CFLAGS=
diff --git a/configure.ac b/configure.ac
index 70380ff..b510151 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1649,7 +1649,7 @@ if test "x$enable_gallium_llvm" = xyes; then
     if test "x$LLVM_CONFIG" != xno; then
 	LLVM_VERSION=`$LLVM_CONFIG --version`
 	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags`
-	LLVM_LIBS="`$LLVM_CONFIG --libs jit interpreter nativecodegen bitwriter x86disassembler` -lstdc++"
+	LLVM_LIBS="`$LLVM_CONFIG --libs` -lstdc++"
 
 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
 	GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"