pass cxxflags better

.github/workflows/release.yml

@@ -11,7 +11,6 @@ jobs:
   release:
     env:
       MACOSX_DEPLOYMENT_TARGET: 10.13
-      EXTRA_FLAGS: ${{ matrix.os.name == 'macos' && 'CXXFLAGS="-arch x86_64 -arch arm64"'|| ''}}
       BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}
       PROD_MACOS_CERTIFICATE: '${{ secrets.PROD_MACOS_CERTIFICATE }}'
       PROD_MACOS_CERTIFICATE_PWD: '${{ secrets.PROD_MACOS_CERTIFICATE_PWD }}'
@@ -67,7 +66,7 @@ jobs:
         run: 'sudo ./.github/workflows/scripts/linux/install-tgui.sh'
         if: ${{ matrix.os.name == 'ubuntu' }}
       - name: Build
-        run: '${{ matrix.os.scons-script }} test=false debug=$DEBUG_FLAG $EXTRA_FLAGS'
+        run: '${{ matrix.os.scons-script }} test=false debug=$DEBUG_FLAG
         shell: bash
 
       - name: Download fix-rpaths.py script

.github/workflows/scripts/mac/scons-build.sh

@@ -4,4 +4,4 @@ export CC="$(brew --prefix llvm)/bin/clang"
 export CXX="$(brew --prefix llvm)/bin/clang++"
 export SDKROOT="$(xcrun --show-sdk-path)"
 
-scons CXXFLAGS="-I/usr/local/opt/zlib/include" LINKFLAGS="-L/usr/local/opt/zlib/lib" $@
+scons CXXFLAGS="-I/usr/local/opt/zlib/include -arch x86_64 -arch arm64" LINKFLAGS="-L/usr/local/opt/zlib/lib" $@