Mesa (master): scons: update for LLVM 4.0
Emil Velikov
evelikov at kemper.freedesktop.org
Thu May 4 17:13:56 UTC 2017
Module: Mesa
Branch: master
Commit: 58f51f0754d736e76248e075bd25424ff4b64b46
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=58f51f0754d736e76248e075bd25424ff4b64b46
Author: Ben Boeckel <mathstuf at gmail.com>
Date: Thu Apr 27 16:31:48 2017 -0400
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 at lists.freedesktop.org>
Reviewed-by: Chuck Atkins <chuck.atkins at kitware.com>
Signed-off-by: Ben Boeckel <ben.boeckel at kitware.com>
Acked-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
---
scons/llvm.py | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/scons/llvm.py b/scons/llvm.py
index ec816e8a57..928fc97345 100644
--- a/scons/llvm.py
+++ b/scons/llvm.py
@@ -103,8 +103,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',
More information about the mesa-commit
mailing list