From 5bbbefb2a7965a9c9de61655acadf6dfb02b3b5a Mon Sep 17 00:00:00 2001
From: Mauro Balades <mauro.balades@tutanota.com>
Date: Thu, 1 Aug 2024 17:08:46 +0200
Subject: [PATCH] chore: Update Windows build configuration for compatibility
 with x32 architecture

---
 .github/workflows/windows-alpha-build.yml |  2 ++
 configs/common/mozconfig                  |  9 ++++++---
 configs/windows/mozconfig                 | 16 ++++++++--------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/windows-alpha-build.yml b/.github/workflows/windows-alpha-build.yml
index 858a59fbb..2d9360b12 100644
--- a/.github/workflows/windows-alpha-build.yml
+++ b/.github/workflows/windows-alpha-build.yml
@@ -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
diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index b4d231b64..b08c092a7 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -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
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 84cbad061..cb60030d0 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -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