From 96574e49eb13357f2da03c0d8dd5181cb7f41b4c Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Thu, 28 Jul 2022 08:04:44 -0700 Subject: [PATCH] devops: fix Firefox build on Linux (#16022) Prebuilt WASI sysroot is not availabe any more, so this patch disables sandboxing via WASI for now in our builds. I tried compiling WASI manually, but it didn't work out for me for some reason. --- browser_patches/firefox-beta/build.sh | 7 +++---- browser_patches/firefox/build.sh | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/browser_patches/firefox-beta/build.sh b/browser_patches/firefox-beta/build.sh index cc0b48f4a7..70d2da2940 100755 --- a/browser_patches/firefox-beta/build.sh +++ b/browser_patches/firefox-beta/build.sh @@ -89,10 +89,8 @@ if [[ -n "${IS_LINUX_ARM64}" ]]; then echo "ac_add_options --target=aarch64-linux-gnu" >> .mozconfig fi -if is_linux "debian" 11; then - # There's no pre-built wasi sysroot for Debian 11. - echo "ac_add_options --without-wasm-sandboxed-libraries" >> .mozconfig -fi +# There's no pre-built wasi sysroot on certain platforms. +echo "ac_add_options --without-wasm-sandboxed-libraries" >> .mozconfig OBJ_FOLDER="obj-build-playwright" echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig @@ -143,6 +141,7 @@ if [[ -n "${IS_FULL}" ]]; then git checkout browser_upstream/master SHELL=/bin/sh ./mach --no-interactive bootstrap --application-choice=browser git checkout - + rm -rf "${OBJ_FOLDER}" if [[ ! -z "${WIN32_REDIST_DIR}" ]]; then # Having this option in .mozconfig kills incremental compilation. diff --git a/browser_patches/firefox/build.sh b/browser_patches/firefox/build.sh index 56eb9906b9..522579bd15 100755 --- a/browser_patches/firefox/build.sh +++ b/browser_patches/firefox/build.sh @@ -89,10 +89,8 @@ if [[ -n "${IS_LINUX_ARM64}" ]]; then echo "ac_add_options --target=aarch64-linux-gnu" >> .mozconfig fi -if is_linux "debian" 11; then - # There's no pre-built wasi sysroot for Debian 11. - echo "ac_add_options --without-wasm-sandboxed-libraries" >> .mozconfig -fi +# There's no pre-built wasi sysroot on certain platforms. +echo "ac_add_options --without-wasm-sandboxed-libraries" >> .mozconfig OBJ_FOLDER="obj-build-playwright" echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig @@ -143,6 +141,7 @@ if [[ -n "${IS_FULL}" ]]; then git checkout browser_upstream/master SHELL=/bin/sh ./mach --no-interactive bootstrap --application-choice=browser git checkout - + rm -rf "${OBJ_FOLDER}" if [[ ! -z "${WIN32_REDIST_DIR}" ]]; then # Having this option in .mozconfig kills incremental compilation.