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 464978 f80dc9fc34680105b714a49b4704bb843f5f7004
parent 464954 36486fdc3813ef7943ae5b07b4128866d1938a6c
child 464979 4f2569c270ace4fbb0c053e105ae289167b5dac0
child 464985 77b9e7bd07d60c96ef3bd0e496a6f08f139d2caa
child 464987 dd3a5c301e87b85afd4415a14671ae5b4f639b55
child 464989 a643b96263d3df285cbe253b63e4e5e93dfb2fc7
child 465000 b91343e385108d3af36185c61b79552aa9d7f167
child 465070 e85f127ff02c878b61079a4cd4ccd6b5ba41a5f7
child 465489 3f933b154cd3348e367628b1c703f1f50e8fec3b
child 465576 b3143e5fff9ab8240dc2349baeffc5e2349d761f
child 465626 93a8b2bae45236664064dbce2f0075cafa67e473
child 465693 9335024be869b341e76235654d1e88049e4c6000
child 465710 3d8ee9ab7bfec4519d6161033f438400a24eb25f
child 465726 56622fe9a8eb8c6f0b99ee17d44f3a074502be15
child 466138 491f93ce7edca4d0988b49a4cbe11e8be3b2a7c3
child 466141 5289cad87b8462fd2258e63ef88c3843d2f6eeff
child 466169 19f37f9ac6f56447ce8fa08f9fbe3b0cddd508f1
child 466237 3bbfc5b0eee3b9426519cc0d5a3a2486fd9260b0
child 467301 956a50c2820c5174c2cb74338396f6a4b0dac0d8
child 480310 d8c4585d419e0a303f0bf6e54adb6cea5072c9c1
push id42504
push userjodvarko@mozilla.com
push dateMon, 23 Jan 2017 14:50:46 +0000
reviewersme, Tomcat
bugs1333054
milestone53.0a1
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'),