diff options
| author | Keith Kriewall <keith.kriewall@attachmate.com> | 2013-02-28 15:40:02 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2013-02-28 15:40:02 +0000 |
| commit | efd8311a54a945953d5372dded0d6f88349bf58b (patch) | |
| tree | 87901c13241d7187e9dbf08f1b7746ae1b304077 /scons | |
| parent | 2506b035031d6022fec0465bffac8eedd43de0f9 (diff) | |
| download | external_mesa3d-efd8311a54a945953d5372dded0d6f88349bf58b.zip external_mesa3d-efd8311a54a945953d5372dded0d6f88349bf58b.tar.gz external_mesa3d-efd8311a54a945953d5372dded0d6f88349bf58b.tar.bz2 | |
scons: Fix Windows build with LLVM 3.2
Fixes fdo bug 61299
NOTE: This is a candidate for the stable branches.
Signed-off-by: José Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/llvm.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/scons/llvm.py b/scons/llvm.py index e1ed760..7f00c6c 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -92,7 +92,19 @@ def generate(env): 'HAVE_STDINT_H', ]) env.Prepend(LIBPATH = [os.path.join(llvm_dir, 'lib')]) - if llvm_version >= distutils.version.LooseVersion('3.0'): + if llvm_version >= distutils.version.LooseVersion('3.2'): + # 3.2 + env.Prepend(LIBS = [ + 'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser', + 'LLVMX86CodeGen', 'LLVMX86Desc', 'LLVMSelectionDAG', + 'LLVMAsmPrinter', 'LLVMMCParser', 'LLVMX86AsmPrinter', + 'LLVMX86Utils', 'LLVMX86Info', 'LLVMJIT', + 'LLVMExecutionEngine', 'LLVMCodeGen', 'LLVMScalarOpts', + 'LLVMInstCombine', 'LLVMTransformUtils', 'LLVMipa', + 'LLVMAnalysis', 'LLVMTarget', 'LLVMMC', 'LLVMCore', + 'LLVMSupport', 'LLVMRuntimeDyld', 'LLVMObject' + ]) + elif llvm_version >= distutils.version.LooseVersion('3.0'): # 3.0 env.Prepend(LIBS = [ 'LLVMBitWriter', 'LLVMX86Disassembler', 'LLVMX86AsmParser', |