Skip to content

Commit f437815

Browse files
committed
Compile for x86_64 on macOS even with an arm64 host
We don't support arm64 on macOS yet.
1 parent 8fe6e74 commit f437815

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

.github/workflows/abi-cafe.yml

+4
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ jobs:
5151
if: matrix.env.TARGET_TRIPLE == 'x86_64-pc-windows-gnu'
5252
run: rustup set default-host x86_64-pc-windows-gnu
5353

54+
- name: Use x86_64 compiler on macOS
55+
if: matrix.os == 'macos-latest' && matrix.env.TARGET_TRIPLE == 'x86_64-apple-darwin'
56+
run: rustup set default-host x86_64-apple-darwin
57+
5458
- name: Select XCode version
5559
if: matrix.os == 'macos-latest'
5660
run: sudo xcode-select -s /Applications/Xcode_14.3.1.app

.github/workflows/main.yml

+8
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@ jobs:
9898
if: matrix.os == 'windows-latest' && matrix.env.TARGET_TRIPLE == 'x86_64-pc-windows-gnu'
9999
run: rustup set default-host x86_64-pc-windows-gnu
100100

101+
- name: Use x86_64 compiler on macOS
102+
if: matrix.os == 'macos-latest' && matrix.env.TARGET_TRIPLE == 'x86_64-apple-darwin'
103+
run: rustup set default-host x86_64-apple-darwin
104+
101105
- name: Install toolchain and emulator
102106
if: matrix.apt_deps != null
103107
run: |
@@ -234,6 +238,10 @@ jobs:
234238
if: matrix.os == 'windows-latest' && matrix.env.TARGET_TRIPLE == 'x86_64-pc-windows-gnu'
235239
run: rustup set default-host x86_64-pc-windows-gnu
236240

241+
- name: Use x86_64 compiler on macOS
242+
if: matrix.os == 'macos-latest' && matrix.env.TARGET_TRIPLE == 'x86_64-apple-darwin'
243+
run: rustup set default-host x86_64-apple-darwin
244+
237245
- name: Install MinGW toolchain
238246
if: matrix.os == 'ubuntu-latest' && matrix.env.TARGET_TRIPLE == 'x86_64-pc-windows-gnu'
239247
run: |

0 commit comments

Comments
 (0)