From 11f570be61294fbf1500bf802b5dfb62ca5e35c8 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Tue, 2 Feb 2021 21:53:23 -0800 Subject: [PATCH] devops(firefox): fix Firefox on Apple Silicon (#5272) As per guide at https://docs.google.com/document/d/1N5yfEVEISofMmjAxfj3xXONGwyQYBSilsfXqux_M6TM/edit --- browser_patches/firefox/build.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/browser_patches/firefox/build.sh b/browser_patches/firefox/build.sh index 94ddbcc058..d45af9e714 100755 --- a/browser_patches/firefox/build.sh +++ b/browser_patches/firefox/build.sh @@ -78,7 +78,12 @@ OBJ_FOLDER="obj-build-playwright" echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig if [[ $1 == "--full" ]]; then - SHELL=/bin/sh ./mach bootstrap --application-choice=browser --no-interactive --no-system-changes + if [[ "$(uname)" == "Darwin" && "$(uname -m)" == "arm64" ]]; then + ./mach artifact toolchain --from-build macosx64-node + mv node "$HOME/.mozbuild" + elif [[ "$(uname)" == "Darwin" || "$(uname)" == "Linux" ]]; then + SHELL=/bin/sh ./mach bootstrap --application-choice=browser --no-interactive --no-system-changes + fi fi if ! [[ -f "$HOME/.mozbuild/_virtualenvs/mach/bin/python" ]]; then