Cross compile x86_64 deps on arm mac CI

Author: ankith26

.github/workflows/build-macos.yml

@@ -24,8 +24,8 @@ jobs:
       matrix:
         # make arm64 deps and x86_64 deps
         include:
-          - { macarch: arm64, os: macos-14 }
-          - { macarch: x86_64, os: macos-13 }
+          - { macarch: arm64, os: macos-15 }
+          - { macarch: x86_64, os: macos-15 }
 
     steps:
       - uses: actions/[email protected]
@@ -64,8 +64,8 @@ jobs:
       fail-fast: false  # if a particular matrix build fails, don't skip the rest
       matrix:
         include:
-          - { macarch: arm64, os: macos-14 }
-          - { macarch: x86_64, os: macos-13 }
+          - { macarch: arm64, os: macos-15 }
+          - { macarch: x86_64, os: macos-15 }
 
     env:
       MAC_ARCH: ${{ matrix.macarch }}

buildconfig/macdependencies/build_mac_deps.sh

@@ -49,12 +49,21 @@ else
     # install NASM to generate optimised x86_64 libjpegturbo builds
     brew install nasm
 
+    # for scripts using ./configure to make x86_64 binaries
+    export CC="clang -target x86_64-apple-macos10.11"
+    export CXX="clang++ -target x86_64-apple-macos10.11"
+
+    export PG_BASE_CONFIGURE_FLAGS="$PG_BASE_CONFIGURE_FLAGS --host=x86_64-apple-darwin"
+
+    # configure cmake to cross-compile
+    export PG_BASE_CMAKE_FLAGS="$PG_BASE_CMAKE_FLAGS -DCMAKE_OSX_ARCHITECTURES=x86_64"
+
     # SDL 2.26.5 new minimum macos is 10.11, so we build our x86 mac deps
     # for 10.11 as well.
     export MACOSX_DEPLOYMENT_TARGET=10.11
 
-    # needs native-file that has correct macosx deployment target
-    export PG_BASE_MESON_FLAGS="$PG_BASE_MESON_FLAGS --native-file $(pwd)/macos_x86_64.ini"
+    # configure meson to cross-compile with correct target
+    export PG_BASE_MESON_FLAGS="$PG_BASE_MESON_FLAGS --cross-file $(pwd)/macos_x86_64.ini"
 fi
 
 cd ../manylinux-build/docker_base

buildconfig/macdependencies/macos_x86_64.ini

@@ -1,5 +1,11 @@
 [constants]
-macos_ver = ['-mmacosx-version-min=10.11']
+macos_ver = ['-target', 'x86_64-apple-macos10.11']
+
+[host_machine]
+system = 'darwin'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'
 
 [binaries]
 c = ['clang']