From eda097f5e5375454b154cb4d10c355cef2f8a503 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Fri, 11 Jun 2021 02:04:08 -0700 Subject: [PATCH] devops: fix Firefox build on Apple Silicon (#7068) --- browser_patches/firefox-beta/build.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/browser_patches/firefox-beta/build.sh b/browser_patches/firefox-beta/build.sh index 07a35f6ea6..41cc5778a9 100755 --- a/browser_patches/firefox-beta/build.sh +++ b/browser_patches/firefox-beta/build.sh @@ -82,11 +82,7 @@ echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig echo "ac_add_options --disable-crashreporter" >> .mozconfig if [[ $1 == "--full" || $2 == "--full" ]]; then - if [[ "$(uname)" == "Darwin" && "$(uname -m)" == "arm64" ]]; then - ./mach artifact toolchain --from-build macosx64-node - rm -rf "$HOME/.mozbuild/node" - mv node "$HOME/.mozbuild/" - elif [[ "$(uname)" == "Darwin" || "$(uname)" == "Linux" ]]; then + if [[ "$(uname)" == "Darwin" || "$(uname)" == "Linux" ]]; then SHELL=/bin/sh ./mach --no-interactive bootstrap --application-choice=browser fi if [[ ! -z "${WIN32_REDIST_DIR}" ]]; then