chore: Update Windows build configuration for compatibility with x32 architecture

This commit is contained in:
Mauro Balades
2024-08-01 17:08:46 +02:00
parent ea5c42674e
commit 5bbbefb2a7
3 changed files with 16 additions and 11 deletions

View File

@@ -121,6 +121,8 @@ jobs:
cargo download -x windows=0.52.0
#? https://github.com/mozilla/sccache#known-caveats
export CARGO_INCREMENTAL=0
echo "" >> ../configs/common/mozconfig
echo "export MOZ_WINDOWS_RS_DIR=$(pwd)/windows-0.52.0" >> ../configs/common/mozconfig
- uses: actions/download-artifact@v4

View File

@@ -31,11 +31,14 @@ if test "$ZEN_RELEASE"; then
ac_add_options --disable-debug-symbols
ac_add_options --disable-debug-js-modules
ac_add_options --disable-tests
ac_add_options --enable-install-strip
ac_add_options --disable-jprof
ac_add_options --enable-strip
export STRIP_FLAGS="--strip-debug --strip-unneeded"
if test "$ZEN_CROSS_COMPILING"; then
# TODO: Should actually be "not on windows"
ac_add_options --enable-install-strip
ac_add_options --enable-strip
export STRIP_FLAGS="--strip-debug --strip-unneeded"
fi
ac_add_options --enable-rust-simd
mk_add_options MOZ_PARALLEL_COMPILE=1

View File

@@ -7,14 +7,6 @@ if test "$ZEN_CROSS_COMPILING"; then
export WINE="$(echo ~)/win-cross/wine/bin/wine64"
export WINEDEBUG=-all
#? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
#? https://phabricator.services.mozilla.com/D170170
if test "$SURFER_COMPAT" = "true"; then
ac_add_options --target=i686-pc-windows-msvc
else
ac_add_options --target=x86_64-pc-windows-msvc
fi
export MOZ_STUB_INSTALLER=1
export MOZ_PKG_FORMAT=TAR
@@ -33,5 +25,13 @@ if test "$ZEN_CROSS_COMPILING"; then
fi
#? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
#? https://phabricator.services.mozilla.com/D170170
if test "$SURFER_COMPAT" = "true"; then
ac_add_options --target=i686-pc-windows-msvc
else
ac_add_options --target=x86_64-pc-windows-msvc
fi
ac_add_options --disable-maintenance-service
ac_add_options --disable-bits-download