summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Dänzer <[email protected]>2009-01-12 12:37:13 +0100
committerMichel Dänzer <[email protected]>2009-01-12 12:37:13 +0100
commit359bbe7432babb328a313756b9d1e46e187914b8 (patch)
tree05a2302a470e4dca42d3e49ee99c3e7677229f7d
parentf586c31fa6259757ae92868b63783377d7943389 (diff)
gallivm: Explicitly specify the LLVM components we need.
-rw-r--r--SConstruct2
-rw-r--r--configs/linux-llvm6
2 files changed, 4 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 8c96817daef..baa0f9069b3 100644
--- 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 489cfd0546a..a9d740574cf 100644
--- 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=