Skip to content

Commit b637f12

Browse files
committed
Add support for aarch64-apple-darwin
Replace 'OSX' language with 'macOS', to match Rust's language.
1 parent 5cd01a1 commit b637f12

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

.cirrus.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ task:
5858
- cargo hack check --each-feature --target i686-unknown-freebsd
5959
before_cache_script: rm -rf $CARGO_HOME/registry/index
6060

61-
# Test OSX in a full VM
61+
# Test macOS x86_64 in a full VM
6262
task:
63-
name: OSX x86_64
63+
name: macOS x86_64
6464
env:
6565
TARGET: x86_64-apple-darwin
6666
osx_instance:
@@ -211,8 +211,8 @@ task:
211211
NOHACK: 1
212212
TARGET: aarch64-apple-ios
213213
# Rustup only supports cross-building from arbitrary hosts for iOS at
214-
# 1.49.0 and above. Below that it's possible to cross-build from an OSX
215-
# host, but OSX VMs are more expensive than Linux VMs.
214+
# 1.49.0 and above. Below that it's possible to cross-build from a macOS
215+
# host, but macOS VMs are more expensive than Linux VMs.
216216
TOOLCHAIN: 1.49.0
217217
- name: iOS x86_64
218218
env:
@@ -236,6 +236,13 @@ task:
236236
- name: Linux x32
237237
env:
238238
TARGET: x86_64-unknown-linux-gnux32
239+
- name: macOS aarch64
240+
env:
241+
TARGET: aarch64-apple-darwin
242+
# macOS aarch64 toolchain isn't available via rustup until 1.49
243+
TOOLCHAIN: 1.49.0
244+
container:
245+
image: rust:1.49
239246
- name: NetBSD x86_64
240247
env:
241248
TARGET: x86_64-unknown-netbsd

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ Tier 1:
6464
* x86_64-unknown-linux-musl
6565

6666
Tier 2:
67+
* aarch64-apple-darwin
6768
* aarch64-apple-ios
6869
* aarch64-linux-android
6970
* arm-linux-androideabi
@@ -87,7 +88,7 @@ Tier 3:
8788

8889
## Minimum Supported Rust Version (MSRV)
8990

90-
nix is supported on Rust 1.46.0 and higher. It's MSRV will not be
91+
nix is supported on Rust 1.46.0 and higher. Its MSRV will not be
9192
changed in the future without bumping the major or minor version.
9293

9394
## Contributing

bors.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,11 @@ status = [
2525
"Linux x32",
2626
"Linux x86_64 musl",
2727
"Linux x86_64",
28+
"macOS aarch64",
29+
"macOS x86_64",
2830
"Minver",
2931
"NetBSD x86_64",
3032
"OpenBSD x86_64",
31-
"OSX x86_64",
3233
"Redox x86_64",
3334
"Rust Stable",
3435
"iOS aarch64",

0 commit comments

Comments
 (0)