scons: fix build with llvm 9.
authorRoland Scheidegger <sroland@vmware.com>
Fri, 24 May 2019 01:46:07 +0000 (03:46 +0200)
committerRoland Scheidegger <sroland@vmware.com>
Fri, 24 May 2019 16:28:28 +0000 (18:28 +0200)
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 <jfonseca@vmware.com>
scons/llvm.py

index 7ebcaf1c58c490669f456fbce43b0c9be30678bc..c6d16a2bbf0b0d61e0c6b29dd333a5d3b4fc5c48 100644 (file)
@@ -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)