Don't build universal binaries on macOS

momo5502 · Jan 23, 2025 · df92819 · df92819
1 parent a69857c
commit df92819
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -80,7 +80,8 @@ jobs:
           - Windows
           - Linux GCC
           - Linux Clang
-          - macOS
+          - macOS arm64
+          - macOS x86_64
           - Android x86_64
           - Android arm64-v8a
         configuration:
@@ -98,8 +99,10 @@ jobs:
           - platform: Linux Clang
             runner: ubuntu-24.04
             clang-version: 18
-          - platform: macOS
+          - platform: macOS arm64
             runner: macos-latest
+          - platform: macOS x86_64
+            runner: macos-13
           - platform: Android x86_64
             runner: ubuntu-24.04
             abi: x86_64
@@ -191,36 +194,31 @@ jobs:
           - configuration: Release
             preset: release
           - platform: Windows
-            build-platform: Windows
             runner: windows-latest
           - platform: Linux GCC
-            build-platform: Linux GCC
             runner: ubuntu-24.04
           - platform: Linux Clang
-            build-platform: Linux Clang
             runner: ubuntu-24.04
           - platform: macOS arm64
-            build-platform: macOS
             runner: macos-latest
           - platform: macOS x86_64
-            build-platform: macOS
             runner: macos-13
     steps:
       - name: Download Test Config
         uses: pyTooling/download-artifact@v4
         with:
-          name: Temp ${{ matrix.build-platform }} ${{matrix.configuration}} Test Config
+          name: Temp ${{ matrix.platform }} ${{matrix.configuration}} Test Config
           path: build/${{matrix.preset}}
 
       - name: Download Artifacts
         uses: pyTooling/download-artifact@v4
         with:
-          name: ${{ matrix.build-platform }} ${{matrix.configuration}} Artifacts
+          name: ${{ matrix.platform }} ${{matrix.configuration}} Artifacts
           path: build/${{matrix.preset}}/artifacts
 
       - name: Download Windows Artifacts
         uses: pyTooling/download-artifact@v4
-        if: "${{ matrix.build-platform != 'Windows' }}"
+        if: "${{ matrix.platform != 'Windows' }}"
         with:
           name: Windows ${{matrix.configuration}} Artifacts
           path: build/${{matrix.preset}}/artifacts

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,10 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0)
-set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+# This breaks unicorn/qemu tcg
+message("${CMAKE_SYSTEM_PROCESSOR }")
+message("${CMAKE_PROCESSOR }")
+set(CMAKE_OSX_ARCHITECTURES "${CMAKE_PROCESSOR}")
 
 ##########################################
 

diff --git a/cmake/compiler-env.cmake b/cmake/compiler-env.cmake
@@ -22,7 +22,6 @@ set(CMAKE_POLICY_DEFAULT_CMP0069 NEW)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
-set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
 
 ##########################################