<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<style type="text/css" style="display:none;"> P {margin-top:0;margin-bottom:0;} </style>
</head>
<body dir="ltr">
<div style="font-family: Calibri, Helvetica, sans-serif; font-size: 12pt; color: rgb(0, 0, 0);">
Reviewed-by: Jose Fonseca <jfonseca@vmware.com></div>
<div>
<div id="appendonsend"></div>
<div style="font-family:Calibri,Helvetica,sans-serif; font-size:12pt; color:rgb(0,0,0)">
<br>
</div>
<hr tabindex="-1" style="display:inline-block; width:98%">
<div id="divRplyFwdMsg" dir="ltr"><font face="Calibri, sans-serif" color="#000000" style="font-size:11pt"><b>From:</b> sroland@vmware.com <sroland@vmware.com><br>
<b>Sent:</b> Friday, May 24, 2019 02:47<br>
<b>To:</b> Jose Fonseca; mesa-dev@lists.freedesktop.org<br>
<b>Cc:</b> Roland Scheidegger<br>
<b>Subject:</b> [PATCH] scons: fix build with llvm 9.</font>
<div> </div>
</div>
<div class="BodyFragment"><font size="2"><span style="font-size:11pt">
<div class="PlainText">From: Roland Scheidegger <sroland@vmware.com><br>
<br>
The x86asmprinter component is gone, and things seem to work by just<br>
removing it.<br>
Bugzilla: <a href="https://bugs.freedesktop.org/show_bug.cgi?id=110707">https://bugs.freedesktop.org/show_bug.cgi?id=110707</a><br>
---<br>
scons/llvm.py | 5 ++++-<br>
1 file changed, 4 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/scons/llvm.py b/scons/llvm.py<br>
index a84ad51d97a..bf9666459c6 100644<br>
--- a/scons/llvm.py<br>
+++ b/scons/llvm.py<br>
@@ -260,7 +260,10 @@ def generate(env):<br>
if '-fno-rtti' in cxxflags:<br>
env.Append(CXXFLAGS = ['-fno-rtti'])<br>
<br>
- components = ['engine', 'mcjit', 'bitwriter', 'x86asmprinter', 'mcdisassembler', 'irreader']<br>
+ if llvm_version < distutils.version.LooseVersion('9.0'):<br>
+ components = ['engine', 'mcjit', 'bitwriter', 'x86asmprinter', 'mcdisassembler', 'irreader']<br>
+ else:<br>
+ components = ['engine', 'mcjit', 'bitwriter', 'mcdisassembler', 'irreader']<br>
<br>
env.ParseConfig('%s --libs ' % llvm_config + ' '.join(components))<br>
env.ParseConfig('%s --ldflags' % llvm_config)<br>
-- <br>
2.17.1<br>
<br>
</div>
</span></font></div>
</div>
</body>
</html>