From e8163dcede3ec5e4c0681e520f07bd3cc15dd48a Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Mon, 23 Jan 2017 09:43:06 -0500 Subject: [PATCH] Bug 1333054 - band-aid - avoid checking llvm-config version if we're not building stylo/bindgen; r=me; a=Tomcat --- toolkit/moz.configure | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/toolkit/moz.configure b/toolkit/moz.configure index eaa9c84cf37c..51202af17d72 100644 --- a/toolkit/moz.configure +++ b/toolkit/moz.configure @@ -606,9 +606,17 @@ def check_minimum_llvm_config_version(llvm_config): 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: