From a453b0920c851ee48432783736769fe9d8d07d38 Mon Sep 17 00:00:00 2001 From: David Major Date: Mon, 16 Mar 2020 17:57:41 +0000 Subject: [PATCH] Bug 1622856 - Disable new pass manager on Mac hosts r=firefox-build-system-reviewers,rstewart Several developers have reported hangs on native Mac builds. I think we should disable the flag on Mac hosts. Even if we could fix the current hangs, without coverage in CI for this build configuration, we're asking for more trouble down the road. Differential Revision: https://phabricator.services.mozilla.com/D67007 --HG-- extra : moz-landing-system : lando --- build/moz.configure/flags.configure | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build/moz.configure/flags.configure b/build/moz.configure/flags.configure index 46a63b648686..d6e03973cd73 100644 --- a/build/moz.configure/flags.configure +++ b/build/moz.configure/flags.configure @@ -31,13 +31,12 @@ set_config('MOZ_RUST_DEFAULT_FLAGS', rust_flags) js_option('--disable-new-pass-manager', help='Use the legacy LLVM pass manager in clang builds') -@depends('--enable-new-pass-manager', c_compiler, host, mozbuild_state_path) -def new_pass_manager_flags(enabled, compiler, host, mozbuild_state_path): +@depends('--enable-new-pass-manager', c_compiler, host) +def new_pass_manager_flags(enabled, compiler, host): if host.os == 'OSX': - # If we're using Xcode's clang, we can't trust its version number - mozbuild_clang_dir = os.path.join(mozbuild_state_path, 'clang', 'bin') - if os.path.dirname(compiler.compiler) != mozbuild_clang_dir: - return None + # Some native Mac builds hang with the new pass manager. Given the + # inability to test in CI, don't take the risk of further breakage. + return None if enabled and compiler.version >= '9.0.0': if compiler.type == 'clang': return ['-fexperimental-new-pass-manager']