Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

devops: fix FF build on MacOS (#16023)

Browse source 
It looks like FF on MacOS requires the `--enable-bootstrap`
flag instead of the original dance with the master branch.
This commit is contained in:
Andrey Lushnikov 2022-07-28 10:49:34 -07:00 committed by GitHub
parent 96574e49eb
commit 792aa6a080
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
browser_patches/firefox-beta/build.sh
View file

@ -126,6 +126,9 @@ if [[ -z "${IS_JUGGLER}" ]]; then
fi fi
if [[ -n "${IS_FULL}" ]]; then if [[ -n "${IS_FULL}" ]]; then
if is_mac; then
echo "ac_add_options --enable-bootstrap" >> .mozconfig
else
# This is a slow but sure way to get all the necessary toolchains. # This is a slow but sure way to get all the necessary toolchains.
# However, it will not work if tree is dirty. # However, it will not work if tree is dirty.
# Bail out if git repo is dirty. # Bail out if git repo is dirty.
@ -142,8 +145,9 @@ if [[ -n "${IS_FULL}" ]]; then
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}" rm -rf "${OBJ_FOLDER}"
fi
if [[ ! -z "${WIN32_REDIST_DIR}" ]]; then if [[ -n "${WIN32_REDIST_DIR}" ]]; then
# Having this option in .mozconfig kills incremental compilation. # Having this option in .mozconfig kills incremental compilation.
echo "export WIN32_REDIST_DIR=\"$WIN32_REDIST_DIR\"" >> .mozconfig echo "export WIN32_REDIST_DIR=\"$WIN32_REDIST_DIR\"" >> .mozconfig
fi fi

6
browser_patches/firefox/build.sh
View file

@ -126,6 +126,9 @@ if [[ -z "${IS_JUGGLER}" ]]; then
fi fi
if [[ -n "${IS_FULL}" ]]; then if [[ -n "${IS_FULL}" ]]; then
if is_mac; then
echo "ac_add_options --enable-bootstrap" >> .mozconfig
else
# This is a slow but sure way to get all the necessary toolchains. # This is a slow but sure way to get all the necessary toolchains.
# However, it will not work if tree is dirty. # However, it will not work if tree is dirty.
# Bail out if git repo is dirty. # Bail out if git repo is dirty.
@ -142,8 +145,9 @@ if [[ -n "${IS_FULL}" ]]; then
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}" rm -rf "${OBJ_FOLDER}"
fi
if [[ ! -z "${WIN32_REDIST_DIR}" ]]; then if [[ -n "${WIN32_REDIST_DIR}" ]]; then
# Having this option in .mozconfig kills incremental compilation. # Having this option in .mozconfig kills incremental compilation.
echo "export WIN32_REDIST_DIR=\"$WIN32_REDIST_DIR\"" >> .mozconfig echo "export WIN32_REDIST_DIR=\"$WIN32_REDIST_DIR\"" >> .mozconfig
fi fi