summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Boeckel <mathstuf@gmail.com>2017-04-27 16:31:48 -0400
committerAndres Gomez <agomez@igalia.com>2017-05-12 21:54:56 +0300
commit576236f3f28eb627711d1050dade0074a53b1487 (patch)
tree56069dbd89d3f450c216480ff27beb7999bf816f
parentdd10f220cf5c2bbc5bc0ce67e25019a247f150fb (diff)
scons: update for LLVM 4.0
LLVMDemangle, LLVMGlobalISel, and LLVMDebugInfoMSF are new. Also update the comment to add irreader to the list of components. CC: <mesa-stable@lists.freedesktop.org> Reviewed-by: Chuck Atkins <chuck.atkins@kitware.com> Signed-off-by: Ben Boeckel <ben.boeckel@kitware.com> Acked-by: Emil Velikov <emil.velikov@collabora.com> Reviewed-by: Jose Fonseca <jfonseca@vmware.com> (cherry picked from commit 58f51f0754d736e76248e075bd25424ff4b64b46)
-rw-r--r--scons/llvm.py22
1 files changed, 20 insertions, 2 deletions
diff --git a/scons/llvm.py b/scons/llvm.py
index 2d0f05b0279..713f56c6019 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -105,8 +105,26 @@ def generate(env):
'HAVE_STDINT_H',
])
env.Prepend(LIBPATH = [os.path.join(llvm_dir, 'lib')])
- # LIBS should match the output of `llvm-config --libs engine mcjit bitwriter x86asmprinter`
- if llvm_version >= distutils.version.LooseVersion('3.9'):
+ # LIBS should match the output of `llvm-config --libs engine mcjit bitwriter x86asmprinter irreader`
+ if llvm_version >= distutils.version.LooseVersion('4.0'):
+ env.Prepend(LIBS = [
+ 'LLVMX86Disassembler', 'LLVMX86AsmParser',
+ 'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter',
+ 'LLVMDebugInfoCodeView', 'LLVMCodeGen',
+ 'LLVMScalarOpts', 'LLVMInstCombine',
+ 'LLVMTransformUtils',
+ 'LLVMBitWriter', 'LLVMX86Desc',
+ 'LLVMMCDisassembler', 'LLVMX86Info',
+ 'LLVMX86AsmPrinter', 'LLVMX86Utils',
+ 'LLVMMCJIT', 'LLVMExecutionEngine', 'LLVMTarget',
+ 'LLVMAnalysis', 'LLVMProfileData',
+ 'LLVMRuntimeDyld', 'LLVMObject', 'LLVMMCParser',
+ 'LLVMBitReader', 'LLVMMC', 'LLVMCore',
+ 'LLVMSupport',
+ 'LLVMIRReader', 'LLVMAsmParser',
+ 'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF',
+ ])
+ elif llvm_version >= distutils.version.LooseVersion('3.9'):
env.Prepend(LIBS = [
'LLVMX86Disassembler', 'LLVMX86AsmParser',
'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter',