Bug 1359508: Allow LLVM 5 for stylo. r?froydnj draft
authorEmilio Cobos Álvarez <emilio@crisal.io>
Fri, 21 Apr 2017 14:12:32 +0200
changeset 568024 26ced55ba597cb5f5116e7354a162bdef92e43c8
parent 568023 f54e795a80c00f6c76fb855e0a0967b7486f0313
child 625799 dd9211bb424cbd9431d270dd211fc94257bd92b4
push id55733
push userbmo:emilio+bugs@crisal.io
push dateTue, 25 Apr 2017 17:35:58 +0000
reviewersfroydnj
bugs1359508
milestone55.0a1
Bug 1359508: Allow LLVM 5 for stylo. r?froydnj MozReview-Commit-ID: 3JtzH7kVR6Z
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -603,19 +603,19 @@ def invoke_llvm_config(llvm_config, *opt
     output.'''
     lines = check_cmd_output(llvm_config, *options).splitlines()
     return lines[0]
 
 @imports(_from='textwrap', _import='dedent')
 def check_minimum_llvm_config_version(llvm_config):
     version = Version(invoke_llvm_config(llvm_config, '--version'))
     min_version = Version('3.9.0')
-    # For various reasons, bindgen only works with LLVM 3.9.x for right now.
-    non_working_version = Version('4.0.0')
-    if version < min_version or version >= non_working_version:
+    # For various reasons, bindgen doesn't work with LLVM 4.0.x.
+    if version < min_version or (version >= Version('4.0.0') and
+                                 version < Version('5.0.0')):
         die(dedent('''\
         llvm installation {} is incompatible with Stylo bindgen.
 
         To compile Stylo, please install version {} of
         Clang + LLVM and ensure that the 'llvm-config' from that
         installation is first on your path.
 
         You can verify this by typing 'llvm-config --version'.