summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Scheidegger <[email protected]>2019-05-24 03:46:07 +0200
committerRoland Scheidegger <[email protected]>2019-05-24 18:28:28 +0200
commit84f3f1cf00fec036c9f503ce46e8bbcc3f9b4ae9 (patch)
treee8dd3674310781e01db369d66ec2211752e095f8
parent9fe1a925e2a4093cd88152a52ad48677d02f6ba5 (diff)
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 <[email protected]>
-rw-r--r--scons/llvm.py5
1 files changed, 4 insertions, 1 deletions
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)