summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Kriewall <keith.kriewall@attachmate.com>2013-02-28 15:40:02 +0000
committerIan Romanick <ian.d.romanick@intel.com>2013-03-05 14:57:10 -0800
commit65baaa070c700c1d84436360220e8815c94e112a (patch)
tree5779ecb94f6c56683a0ea6dea72d70b5892830e1
parent9d0df8207693c3ad2c3aa797a8a4fb8f3842edc0 (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.py14
1 files changed, 13 insertions, 1 deletions
diff --git a/scons/llvm.py b/scons/llvm.py
index e1ed7602211..7f00c6ce1b8 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',