From 8391e6fc2ffb6833a0346d8d275fbf8f897ea050 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sun, 30 Mar 2025 15:34:47 +0200
Subject: [PATCH] refactor: remove debug session from Windows build workflows
 and update optimization flags in mozconfig files

---
 .github/workflows/windows-profile-build.yml | 5 -----
 .github/workflows/windows-release-build.yml | 5 -----
 configs/linux/mozconfig                     | 2 +-
 configs/macos/mozconfig                     | 2 ++
 configs/windows/mozconfig                   | 2 +-
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml
index 4076fcec3..21805ac8c 100644
--- a/.github/workflows/windows-profile-build.yml
+++ b/.github/workflows/windows-profile-build.yml
@@ -94,11 +94,6 @@ jobs:
           echo 'LLVM_PROFDATA=/c/Users/runneradmin/.mozbuild/clang/bin/llvm-profdata.exe JARLOG_FILE=en-US.log ./mach python build/pgo/profileserver.py --binary /c/artifact/zen/zen.exe' '' >> mozilla-build-run.sh
           C:\mozilla-build\start-shell.bat $workspace_dir_current\mozilla-build-run.sh
 
-      - name: Debug session
-        if: ${{ failure() }}
-        uses: WarpBuilds/action-debugger@v1.3
-        timeout-minutes: 15
-
       - name: Move profile data
         if: ${{ matrix.arch == 'x86_64' }}
         run: |
diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml
index 5cf531269..e9d95eeec 100644
--- a/.github/workflows/windows-release-build.yml
+++ b/.github/workflows/windows-release-build.yml
@@ -249,11 +249,6 @@ jobs:
           ls ./dist
           ls .
 
-      - name: Debug session
-        if: ${{ failure() }}
-        uses: WarpBuilds/action-debugger@v1.3
-        timeout-minutes: 15
-
       - name: Move package for PGO upload
         if: ${{ inputs.generate-gpo && matrix.arch == 'x86_64' }}
         run: |
diff --git a/configs/linux/mozconfig b/configs/linux/mozconfig
index 82f66fb67..8d5a5082a 100644
--- a/configs/linux/mozconfig
+++ b/configs/linux/mozconfig
@@ -20,7 +20,7 @@ if test "$SURFER_COMPAT" = "x86_64"; then
     fi
 
     # Optimization flags for SURFER_COMPAT
-    ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -Qvec -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
+    ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
 
     export LDFLAGS="$LDFLAGS -Wl,-O3"
     export RUSTFLAGS="$RUSTFLAGS -Clink-args=--icf=safe"
diff --git a/configs/macos/mozconfig b/configs/macos/mozconfig
index 6575de025..c72cd533d 100644
--- a/configs/macos/mozconfig
+++ b/configs/macos/mozconfig
@@ -30,6 +30,8 @@ if test "$SURFER_COMPAT" = "x86_64"; then
     export CXXFLAGS="-O3 -march=nehalem"
     export LDFLAGS="-Wl,-O3 -march=nehalem"
     export RUSTFLAGS="-Ctarget-cpu=nehalem"
+
+    ac_add_options --disable-clang-plugin
 else
     ac_add_options --target=aarch64-apple-darwin
 
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 9240b043f..93791cda6 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -32,7 +32,7 @@ if test "$SURFER_COMPAT" = "x86_64"; then
   ac_add_options --target=x86_64-pc-windows-msvc
   ac_add_options --enable-eme=widevine,wmfcdm
 
-  ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -Qvec -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
+  ac_add_options --enable-optimize="-O3 -w -ftree-vectorize -mfpmath=sse -mprfchw -msse3 -mcx16 -msahf"
 
   export LDFLAGS="-Wl,-O3"
   export RUSTFLAGS="-Clink-args=--icf=safe"