Module: Mesa Branch: master Commit: bf2bcfe4457e727caf48db8c2e5e70e561395eb3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bf2bcfe4457e727caf48db8c2e5e70e561395eb3
Author: Vinson Lee <[email protected]> Date: Sat Nov 21 22:05:38 2020 -0800 scons: Fix build with llvm-12. This patch fixes these SCons build errors. /usr/bin/ld: build/linux-x86_64-debug/gallium/auxiliary/libgallium.a(lp_bld_misc.os): in function `llvm::InitializeNativeTarget()': llvm/Support/TargetSelect.h:118: undefined reference to `LLVMInitializeX86TargetInfo' /usr/bin/ld: llvm/Support/TargetSelect.h:119: undefined reference to `LLVMInitializeX86Target' /usr/bin/ld: llvm/Support/TargetSelect.h:120: undefined reference to `LLVMInitializeX86TargetMC' /usr/bin/ld: build/linux-x86_64-debug/gallium/auxiliary/libgallium.a(lp_bld_misc.os): in function `llvm::InitializeNativeTargetAsmPrinter()': llvm/Support/TargetSelect.h:132: undefined reference to `LLVMInitializeX86AsmPrinter' /usr/bin/ld: build/linux-x86_64-debug/gallium/auxiliary/libgallium.a(lp_bld_misc.os): in function `llvm::InitializeNativeTargetDisassembler()': llvm/Support/TargetSelect.h:156: undefined reference to `LLVMInitializeX86Disassembler' Signed-off-by: Vinson Lee <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7722> --- scons/llvm.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scons/llvm.py b/scons/llvm.py index 6d837e7d402..3d53125b317 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -322,6 +322,9 @@ def generate(env): if llvm_version >= distutils.version.LooseVersion('8.0'): components.append('coroutines') + if llvm_version >= distutils.version.LooseVersion('12.0'): + components.append('native') + env.ParseConfig('%s --libs ' % llvm_config + ' '.join(components)) env.ParseConfig('%s --ldflags' % llvm_config) env.ParseConfig('%s --system-libs' % llvm_config) _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
