build: try support C23 in Mac builds

LostArtefacts · Jan 29, 2025 · 3cc4b02 · 3cc4b02
1 parent 39fd9f8
commit 3cc4b02
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/.github/workflows/job_build_tr1_macos.yml b/.github/workflows/job_build_tr1_macos.yml
@@ -82,13 +82,17 @@ jobs:
           sudo port -N install apple-pki-bundle curl-ca-bundle
 
       - name: Build arm64 and create app bundle
+        env:
+          CC: clang
         run: |
           BUILD_DIR=build-arm64
           BUILD_OPTIONS="src/tr1 --prefix=/tmp/TR1X.app --bindir=Contents/MacOS --buildtype ${{ inputs.target }}"
           meson setup $BUILD_DIR $BUILD_OPTIONS
           meson install -C $BUILD_DIR
 
       - name: Build x86-64
+        env:
+          CC: clang
         run: |
           BUILD_DIR=build-x86-64
           BUILD_OPTIONS="src/tr1 --prefix=/tmp/TR1X.app --bindir=Contents/MacOS --cross-file tools/shared/mac/x86-64_cross_file.txt --buildtype ${{ inputs.target }}"

diff --git a/.github/workflows/job_build_tr2_macos.yml b/.github/workflows/job_build_tr2_macos.yml
@@ -68,18 +68,30 @@ jobs:
         run: |
           sudo rsync -arvq /tmp/opt_local/ /opt/local/
 
+      - name: "Build dependency: clang-16"
+        # if: steps.restore-cache.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          sudo port -N install clang-16
+          sudo port select --set clang mp-clang-16
+          clang --version
+
       - name: Setup CA
         run: |
           sudo port -N install apple-pki-bundle curl-ca-bundle
 
       - name: Build arm64 and create app bundle
+        env:
+          CC: clang
         run: |
           BUILD_DIR=build-arm64
           BUILD_OPTIONS="src/tr2 --prefix=/tmp/TR2X.app --bindir=Contents/MacOS --buildtype ${{ inputs.target }}"
           meson setup $BUILD_DIR $BUILD_OPTIONS
           meson install -C $BUILD_DIR
 
       - name: Build x86-64
+        env:
+          CC: clang
         run: |
           BUILD_DIR=build-x86-64
           BUILD_OPTIONS="src/tr2 --prefix=/tmp/TR2X.app --bindir=Contents/MacOS --cross-file tools/shared/mac/x86-64_cross_file.txt --buildtype ${{ inputs.target }}"