Bug 1333054 - band-aid - avoid checking llvm-config version if we're not building stylo/bindgen; r=me; a=Tomcat FIREFOX_AURORA_53_BASE
authorNathan Froyd <froydnj@mozilla.com>
Mon, 23 Jan 2017 09:43:06 -0500
changeset 377907 f80dc9fc34680105b714a49b4704bb843f5f7004
parent 377906 36486fdc3813ef7943ae5b07b4128866d1938a6c
child 377908 a643b96263d3df285cbe253b63e4e5e93dfb2fc7
child 379623 3f933b154cd3348e367628b1c703f1f50e8fec3b
child 379739 e85f127ff02c878b61079a4cd4ccd6b5ba41a5f7
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, Tomcat
bugs1333054
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1333054 - band-aid - avoid checking llvm-config version if we're not building stylo/bindgen; r=me; a=Tomcat
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -601,19 +601,27 @@ def check_minimum_llvm_config_version(ll
 
         To compile Stylo, please install at least 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'.
         '''.format(version, min_version)))
 
-@depends(llvm_config, '--with-libclang-path', '--with-clang-path')
+@depends('--enable-stylo', '--enable-stylo-build-bindgen',
+         llvm_config, '--with-libclang-path', '--with-clang-path')
 @imports(_from='textwrap', _import='dedent')
-def bindgen_config_paths(llvm_config, libclang_path, clang_path):
+def bindgen_config_paths(stylo_enabled, bindgen_enabled,
+                         llvm_config, libclang_path, clang_path):
+    if not stylo_enabled:
+        return None
+
+    if not bindgen_enabled:
+        return None
+
     if not libclang_path and not clang_path:
         # We must have LLVM_CONFIG in this case.
         if not llvm_config:
             return None
 
         check_minimum_llvm_config_version(llvm_config)
         return namespace(
             libclang_path=invoke_llvm_config(llvm_config, '--libdir'),