Merge #1652

1652: Add support for aarch64-apple-darwin r=asomers a=rtzoeller

Supersedes #1396, resolves #1646.

Also replace 'OSX' language with 'macOS', to match Rust's language.

Co-authored-by: Ryan Zoeller <[email protected]>

Author: bors[bot]

.cirrus.yml

@@ -58,9 +58,9 @@ task:
     - cargo hack check --each-feature --target i686-unknown-freebsd
   before_cache_script: rm -rf $CARGO_HOME/registry/index
 
-# Test OSX in a full VM
+# Test macOS x86_64 in a full VM
 task:
-  name: OSX x86_64
+  name: macOS x86_64
   env:
     TARGET: x86_64-apple-darwin
   osx_instance:
@@ -211,8 +211,8 @@ task:
         NOHACK: 1
         TARGET: aarch64-apple-ios
         # Rustup only supports cross-building from arbitrary hosts for iOS at
-        # 1.49.0 and above.  Below that it's possible to cross-build from an OSX
-        # host, but OSX VMs are more expensive than Linux VMs.
+        # 1.49.0 and above.  Below that it's possible to cross-build from a macOS
+        # host, but macOS VMs are more expensive than Linux VMs.
         TOOLCHAIN: 1.49.0
     - name: iOS x86_64
       env:
@@ -236,6 +236,13 @@ task:
     - name: Linux x32
       env:
         TARGET: x86_64-unknown-linux-gnux32
+    - name: macOS aarch64
+      env:
+        TARGET: aarch64-apple-darwin
+        # macOS aarch64 toolchain isn't available via rustup until 1.49
+        TOOLCHAIN: 1.49.0
+      container:
+        image: rust:1.49
     - name: NetBSD x86_64
       env:
         TARGET: x86_64-unknown-netbsd

README.md

@@ -64,6 +64,7 @@ Tier 1:
   * x86_64-unknown-linux-musl
 
 Tier 2:
+  * aarch64-apple-darwin
   * aarch64-apple-ios
   * aarch64-linux-android
   * arm-linux-androideabi
@@ -87,7 +88,7 @@ Tier 3:
 
 ## Minimum Supported Rust Version (MSRV)
 
-nix is supported on Rust 1.46.0 and higher.  It's MSRV will not be
+nix is supported on Rust 1.46.0 and higher.  Its MSRV will not be
 changed in the future without bumping the major or minor version.
 
 ## Contributing

bors.toml

@@ -25,10 +25,11 @@ status = [
   "Linux x32",
   "Linux x86_64 musl",
   "Linux x86_64",
+  "macOS aarch64",
+  "macOS x86_64",
   "Minver",
   "NetBSD x86_64",
   "OpenBSD x86_64",
-  "OSX x86_64",
   "Redox x86_64",
   "Rust Stable",
   "iOS aarch64",