diff options
| author | pal1000 <liviuprodea@yahoo.com> | 2020-04-11 11:16:41 +0300 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2020-04-14 08:40:56 +0000 |
| commit | f0b94262c18284dc61755634f01eb78051b4423e (patch) | |
| tree | a1623cebcf1fe607321c8a35be924d3cc92b8687 /scons | |
| parent | c38946e62ddce554d20bf913cebeebf25bf153a4 (diff) | |
scons/windows: Support build with LLVM 10.
LLVM engine component contains 2 new libraries, LLVMCFGuard and LLVMTextAPI.
Without them build fails like in this run: https://ci.appveyor.com/project/Alexpux/mingw-packages/builds/32102425/job/wkmb4gimfqkkb3cg
Cc: <mesa-stable@lists.freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4521>
Diffstat (limited to 'scons')
| -rw-r--r-- | scons/llvm.py | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/scons/llvm.py b/scons/llvm.py index 6d04bd55522..dac3555995b 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -111,7 +111,30 @@ def generate(env): # and `llvm-config --libs engine coroutines` for LLVM>=8.0 # LLVMAggressiveInstCombine library part of engine component since LLVM 6 is only needed by Mesa3D for LLVM>=8. # While not directly needed by Mesa3D, this library is needed by LLVMipo which is part of coroutines component. - if llvm_version >= distutils.version.LooseVersion('9.0'): + if llvm_version >= distutils.version.LooseVersion('10.0'): + env.Prepend(LIBS = [ + 'LLVMX86Disassembler', 'LLVMX86AsmParser', + 'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter', + 'LLVMDebugInfoCodeView', 'LLVMCodeGen', + 'LLVMScalarOpts', 'LLVMInstCombine', + 'LLVMTransformUtils', + 'LLVMBitWriter', 'LLVMX86Desc', + 'LLVMMCDisassembler', 'LLVMX86Info', + 'LLVMX86Utils', + 'LLVMMCJIT', 'LLVMExecutionEngine', 'LLVMTarget', + 'LLVMAnalysis', 'LLVMProfileData', + 'LLVMRuntimeDyld', 'LLVMObject', 'LLVMMCParser', + 'LLVMBitReader', 'LLVMMC', 'LLVMCore', + 'LLVMSupport', + 'LLVMIRReader', 'LLVMAsmParser', + 'LLVMDemangle', 'LLVMGlobalISel', 'LLVMDebugInfoMSF', + 'LLVMBinaryFormat', + 'LLVMRemarks', 'LLVMBitstreamReader', 'LLVMDebugInfoDWARF', + 'LLVMAggressiveInstCombine','LLVMLinker', 'LLVMVectorize', + 'LLVMInstrumentation', 'LLVMipo', 'LLVMCoroutines', + 'LLVMCFGuard', 'LLVMTextAPI', + ]) + elif llvm_version >= distutils.version.LooseVersion('9.0'): env.Prepend(LIBS = [ 'LLVMX86Disassembler', 'LLVMX86AsmParser', 'LLVMX86CodeGen', 'LLVMSelectionDAG', 'LLVMAsmPrinter', |