From a7fe238a71b998f5a8607a960baa4e8f777a9197 Mon Sep 17 00:00:00 2001
From: Mauro Balades <mauro.balades@tutanota.com>
Date: Tue, 23 Jul 2024 11:56:09 +0200
Subject: [PATCH] chore: Update Windows profile build workflow to use
 x86_64-pc-mingw32 target

---
 .github/workflows/src/windows_mozconfig | 4 +---
 configs/common/mozconfig                | 1 -
 configs/macos/mozconfig                 | 8 ++++----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/src/windows_mozconfig b/.github/workflows/src/windows_mozconfig
index 5bf69840c..4ff1662f4 100644
--- a/.github/workflows/src/windows_mozconfig
+++ b/.github/workflows/src/windows_mozconfig
@@ -7,8 +7,7 @@ export WINEDEBUG=-all
 
 #? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
 #? https://phabricator.services.mozilla.com/D170170
-ac_add_options --target=x86_64-pc-windows-msvc
-ac_add_options --with-toolchain-prefix=x86_64-pc-mingw32
+ac_add_options --target=x86_64-pc-mingw32
 
 export MOZ_STUB_INSTALLER=1
 export MOZ_PKG_FORMAT=TAR
@@ -35,7 +34,6 @@ if test "$ZEN_GA_GENERATE_PROFILE"; then
   mk_add_options "export MOZ_AUTOMATION_PACKAGE_GENERATED_SOURCES=0"
   ac_add_options --enable-profile-generate=cross
   ac_add_options --without-wasm-sandboxed-libraries
-  ac_add_options --enable-proxy-bypass-protection
 else
   ac_add_options --disable-profiling
   ac_add_options --enable-profile-use=cross
diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 58adf57d4..d0a1bbda9 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -31,7 +31,6 @@ ac_add_options --enable-bootstrap
 ac_add_options --enable-application=browser
 
 if test "$ZEN_RELEASE"; then
-  ac_add_options --enable-optimize
   ac_add_options --enable-release
   ac_add_options --disable-debug
   ac_add_options --disable-debug-symbols
diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig
index 478ef318b..b5249a1f9 100644
--- a/configs/macos/mozconfig
+++ b/configs/macos/mozconfig
@@ -1,9 +1,9 @@
 POLLY="-mllvm -polly -mllvm -polly-2nd-level-tiling -mllvm -polly-loopfusion-greedy -mllvm -polly-pattern-matching-based-opts -mllvm -polly-position=before-vectorizer -mllvm -polly-vectorizer=stripmine"
 
-if test "$ZEN_RELEASE"; then
-  ac_add_options --enable-optimize="-mcpu=apple-m1 -O3 -w"
-  export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=apple-m1"
-fi
+# if test "$ZEN_RELEASE"; then
+#   ac_add_options --enable-optimize="-mcpu=apple-m1 -O3 -w"
+#   export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=apple-m1"
+# fi
 
 ac_add_options --enable-install-strip
 ac_add_options --target=aarch64-apple-darwin