Fix windows; fix '-mcpu' arg

Author: justsmth

.github/workflows/zig.yml

@@ -11,9 +11,6 @@ jobs:
   zig:
     if: github.repository_owner == 'aws'
     runs-on: ${{ matrix.config.host }}
-    env:
-      CFLAGS: "-fno-sanitize=all"
-      CXXFLAGS: "-fno-sanitize=all"
     strategy:
       fail-fast: false
       matrix:
@@ -48,10 +45,12 @@ jobs:
         if: matrix.os.name != 'windows-latest'
         shell: bash
         run: |
+          echo "CFLAGS=${CFLAGS} -fno-sanitize=all"
+          echo "CXXFLAGS=${CXXFLAGS} -fno-sanitize=all"
           echo "ZIGCC=${PWD}/util/zig-cc" >> $GITHUB_ENV
           echo "ZIGCXX=${PWD}/util/zig-c++" >> $GITHUB_ENV
       - name: Locate zig on Windows
-        if: matrix.os.name == 'windows-latest'
+        if: matrix.config.host == 'windows-latest'
         shell: bash
         run: |
           ZIGCC="python3 $(cygpath -m $(which zigcc))"

util/zig-c++

@@ -16,7 +16,7 @@ filter_problematic_flags() {
         case "$arg" in
             -march=armv8.4-a+sha3)
                 # Replace the specific problematic flag with a compatible one
-                args+=("-mcpu=generic" "-mattr=+v8.4a,+sha3")
+                args+=("-mcpu=generic+v8.4a+sha3")
                 ;;
             *)
                 # Keep all other arguments including mcpu, mtune, and other march flags

util/zig-cc

@@ -16,7 +16,7 @@ filter_problematic_flags() {
         case "$arg" in
             -march=armv8.4-a+sha3)
                 # Replace the specific problematic flag with a compatible one
-                args+=("-mcpu=generic" "-mattr=+v8.4a,+sha3")
+                args+=("-mcpu=generic+v8.4a+sha3")
                 ;;
             *)
                 # Keep all other arguments