diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2015-02-03 10:16:50 +0000 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2015-02-03 10:18:51 +0000 |
| commit | 5b941ce8575089279b92797f7c10aa294cbc16c8 (patch) | |
| tree | 42f00d56c6c6a91db840eeeef71c9e3eb6a7cf4a /scons | |
| parent | bc321db75b7a4d2f5b71382bfd61d1eced1905cd (diff) | |
| download | external_mesa3d-5b941ce8575089279b92797f7c10aa294cbc16c8.zip external_mesa3d-5b941ce8575089279b92797f7c10aa294cbc16c8.tar.gz external_mesa3d-5b941ce8575089279b92797f7c10aa294cbc16c8.tar.bz2 | |
scons: Fix Windows builds with LLVM 3.5.
LLVMBitReader dependency was introduced, as pointed out by Rob Conde.
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/llvm.py | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/scons/llvm.py b/scons/llvm.py index 1e312f9..d145de8 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -98,8 +98,20 @@ def generate(env): 'HAVE_STDINT_H', ]) env.Prepend(LIBPATH = [os.path.join(llvm_dir, 'lib')]) - if True: - # 3.2 + # LIBS should match the output of `llvm-config --libs engine mcjit bitwriter x86asmprinter` + if llvm_version >= distutils.version.LooseVersion('3.5'): + env.Prepend(LIBS = [ + 'LLVMBitWriter', 'LLVMMCJIT', 'LLVMRuntimeDyld', + 'LLVMX86Disassembler', 'LLVMX86AsmParser', 'LLVMX86CodeGen', + 'LLVMSelectionDAG', 'LLVMAsmPrinter', 'LLVMX86Desc', + 'LLVMObject', 'LLVMMCParser', 'LLVMBitReader', 'LLVMX86Info', + 'LLVMX86AsmPrinter', 'LLVMX86Utils', 'LLVMJIT', + 'LLVMExecutionEngine', 'LLVMCodeGen', 'LLVMScalarOpts', + 'LLVMInstCombine', 'LLVMTransformUtils', 'LLVMipa', + 'LLVMAnalysis', 'LLVMTarget', 'LLVMMC', 'LLVMCore', + 'LLVMSupport' + ]) + else: env.Prepend(LIBS = [ 'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser', 'LLVMX86CodeGen', 'LLVMX86Desc', 'LLVMSelectionDAG', |