Commit 3437f2a2 authored by Georg Koppen's avatar Georg Koppen
Browse files

Bug 40062: Fix mach build bustage with 81.0bx branches

After https://bugzilla.mozilla.org/show_bug.cgi?id=1656993 landed we
can either run `./mach create-mach-environment` or set
`MACH_USE_SYSTEM_PYTHON` to fix build breakage caused by `mach`. We do
the latter as the former fails in our no-network-scenario, too.
parent 6bb6ec36
......@@ -47,6 +47,8 @@ cp -r $gradle_repo/m2/* $gradle_repo
rm -f configure
rm -f js/src/configure
# We unbreak mach, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1656993.
export MACH_USE_SYSTEM_PYTHON=1
./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %]
./mach build --verbose
......
......@@ -79,6 +79,8 @@ steps:
mv $rootdir/[% c('input_files_by_name/gradle-dependencies') %] $gradle_repo
cp -r $gradle_repo/m2/* $gradle_repo
# We unbreak mach, see: https://bugzilla.mozilla.org/show_bug.cgi?id=1656993.
export MACH_USE_SYSTEM_PYTHON=1
# We still need to specify --tor-browser-version due to bug 34005.
./mach configure --with-tor-browser-version=[% c("var/torbrowser_version") %]
./mach build --verbose
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment