From 84f3f1cf00fec036c9f503ce46e8bbcc3f9b4ae9 Mon Sep 17 00:00:00 2001 From: Roland Scheidegger Date: Fri, 24 May 2019 03:46:07 +0200 Subject: [PATCH] scons: fix build with llvm 9. The x86asmprinter component is gone, and things seem to work by just removing it. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=110707 Reviewed-by: Jose Fonseca --- scons/llvm.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scons/llvm.py b/scons/llvm.py index 7ebcaf1c58c..c6d16a2bbf0 100644 --- a/scons/llvm.py +++ b/scons/llvm.py @@ -260,7 +260,10 @@ def generate(env): if '-fno-rtti' in cxxflags: env.Append(CXXFLAGS = ['-fno-rtti']) - components = ['engine', 'mcjit', 'bitwriter', 'x86asmprinter', 'mcdisassembler', 'irreader'] + if llvm_version < distutils.version.LooseVersion('9.0'): + components = ['engine', 'mcjit', 'bitwriter', 'x86asmprinter', 'mcdisassembler', 'irreader'] + else: + components = ['engine', 'mcjit', 'bitwriter', 'mcdisassembler', 'irreader'] env.ParseConfig('%s --libs ' % llvm_config + ' '.join(components)) env.ParseConfig('%s --ldflags' % llvm_config) -- 2.30.2