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.
This commit is contained in:
Родитель
6482ff7a7f
Коммит
96574e49eb
|
@ -89,10 +89,8 @@ if [[ -n "${IS_LINUX_ARM64}" ]]; then
|
||||||
echo "ac_add_options --target=aarch64-linux-gnu" >> .mozconfig
|
echo "ac_add_options --target=aarch64-linux-gnu" >> .mozconfig
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if is_linux "debian" 11; then
|
# There's no pre-built wasi sysroot on certain platforms.
|
||||||
# There's no pre-built wasi sysroot for Debian 11.
|
echo "ac_add_options --without-wasm-sandboxed-libraries" >> .mozconfig
|
||||||
echo "ac_add_options --without-wasm-sandboxed-libraries" >> .mozconfig
|
|
||||||
fi
|
|
||||||
|
|
||||||
OBJ_FOLDER="obj-build-playwright"
|
OBJ_FOLDER="obj-build-playwright"
|
||||||
echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig
|
echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig
|
||||||
|
@ -143,6 +141,7 @@ if [[ -n "${IS_FULL}" ]]; then
|
||||||
git checkout browser_upstream/master
|
git checkout browser_upstream/master
|
||||||
SHELL=/bin/sh ./mach --no-interactive bootstrap --application-choice=browser
|
SHELL=/bin/sh ./mach --no-interactive bootstrap --application-choice=browser
|
||||||
git checkout -
|
git checkout -
|
||||||
|
rm -rf "${OBJ_FOLDER}"
|
||||||
|
|
||||||
if [[ ! -z "${WIN32_REDIST_DIR}" ]]; then
|
if [[ ! -z "${WIN32_REDIST_DIR}" ]]; then
|
||||||
# Having this option in .mozconfig kills incremental compilation.
|
# Having this option in .mozconfig kills incremental compilation.
|
||||||
|
|
|
@ -89,10 +89,8 @@ if [[ -n "${IS_LINUX_ARM64}" ]]; then
|
||||||
echo "ac_add_options --target=aarch64-linux-gnu" >> .mozconfig
|
echo "ac_add_options --target=aarch64-linux-gnu" >> .mozconfig
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if is_linux "debian" 11; then
|
# There's no pre-built wasi sysroot on certain platforms.
|
||||||
# There's no pre-built wasi sysroot for Debian 11.
|
echo "ac_add_options --without-wasm-sandboxed-libraries" >> .mozconfig
|
||||||
echo "ac_add_options --without-wasm-sandboxed-libraries" >> .mozconfig
|
|
||||||
fi
|
|
||||||
|
|
||||||
OBJ_FOLDER="obj-build-playwright"
|
OBJ_FOLDER="obj-build-playwright"
|
||||||
echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig
|
echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig
|
||||||
|
@ -143,6 +141,7 @@ if [[ -n "${IS_FULL}" ]]; then
|
||||||
git checkout browser_upstream/master
|
git checkout browser_upstream/master
|
||||||
SHELL=/bin/sh ./mach --no-interactive bootstrap --application-choice=browser
|
SHELL=/bin/sh ./mach --no-interactive bootstrap --application-choice=browser
|
||||||
git checkout -
|
git checkout -
|
||||||
|
rm -rf "${OBJ_FOLDER}"
|
||||||
|
|
||||||
if [[ ! -z "${WIN32_REDIST_DIR}" ]]; then
|
if [[ ! -z "${WIN32_REDIST_DIR}" ]]; then
|
||||||
# Having this option in .mozconfig kills incremental compilation.
|
# Having this option in .mozconfig kills incremental compilation.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче