Use zig for ARM64 macOS builds

Hamuko · May 5, 2023 · 31d8c7e · 31d8c7e
1 parent 9c56b31
commit 31d8c7e
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -93,6 +93,8 @@ jobs:
           - TARGET: x86_64-apple-darwin
             OS: macos-latest
           - TARGET: aarch64-apple-darwin
+            TARGET_CXX: zigcxx
+            TARGET_AR: ar
             OS: macos-latest
           - TARGET: x86_64-pc-windows-msvc
             OS: windows-latest
@@ -101,6 +103,7 @@ jobs:
       NAME: yurizaki
       TARGET: ${{ matrix.TARGET }}
       TARGET_CC: ${{ matrix.TARGET_CC }}
+      TARGET_CXX: ${{ matrix.TARGET_CXX }}
       TARGET_AR: ${{ matrix.TARGET_AR }}
       OS: ${{ matrix.OS }}
     steps:
@@ -119,8 +122,17 @@ jobs:
             sudo apt-get update
             sudo apt-get install -qq crossbuild-essential-arm64 crossbuild-essential-armhf
           fi
+          if [[ $TARGET == "aarch64-apple-darwin" ]]; then
+            brew install zig
+            mkdir ~/bin
+            cat >>~/bin/zigcxx <<'  EOF'
+            #!/bin/bash
+            zig c++ -target aarch64-macos $@
+            EOF
+            chmod +x ~/bin/zigcxx
+          fi
           # some additional configuration for cross-compilation on linux
-          cat >>~/.cargo/config <<EOF
+          cat >>~/.cargo/config <<-'EOF'
           [target.aarch64-unknown-linux-gnu]
           linker = "aarch64-linux-gnu-gcc"
           [target.aarch64-unknown-linux-musl]
@@ -129,6 +141,8 @@ jobs:
           linker = "arm-linux-gnueabihf-gcc"
           [target.arm-unknown-linux-musleabihf]
           linker = "arm-linux-gnueabihf-gcc"
+          [target.aarch64-apple-darwin]
+          linker = "zigcxx"
           EOF
       - name: Install rust target
         shell: bash