From: Roland Scheidegger <sroland@vmware.com>
Date: Fri, 24 May 2019 01:46:07 +0000 (+0200)
Subject: scons: fix build with llvm 9.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=84f3f1cf00fec036c9f503ce46e8bbcc3f9b4ae9;p=mesa.git

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 <jfonseca@vmware.com>
---

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)