diff options
| author | Keith Kriewall <keith.kriewall@attachmate.com> | 2013-02-28 15:40:02 +0000 |
|---|---|---|
| committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-04-17 12:45:16 +0200 |
| commit | 2c2ba57a77b634dd2101a1ab7832544062361c41 (patch) | |
| tree | 3b22b87ab90b2b615b9995289653b1014426dffa | |
| parent | efa536ff2ed098bb8cbdc91e2dc399cebea0e4db (diff) | |
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>
(cherry picked from commit efd8311a54a945953d5372dded0d6f88349bf58b)
| -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 f87766af19..3e10d216c2 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', |