Merge pull request #25929 from alexrp/maccatalyst

`std.zig.target`: support `aarch64-maccatalyst` and `x86_64-maccatalyst` cross libc

Author: alexrp

build.zig

@@ -94,7 +94,7 @@ pub fn build(b: *std.Build) !void {
     const skip_freebsd = b.option(bool, "skip-freebsd", "Main test suite skips targets with freebsd OS") orelse false;
     const skip_netbsd = b.option(bool, "skip-netbsd", "Main test suite skips targets with netbsd OS") orelse false;
     const skip_windows = b.option(bool, "skip-windows", "Main test suite skips targets with windows OS") orelse false;
-    const skip_macos = b.option(bool, "skip-macos", "Main test suite skips targets with macos OS") orelse false;
+    const skip_darwin = b.option(bool, "skip-darwin", "Main test suite skips targets with darwin OSs") orelse false;
     const skip_linux = b.option(bool, "skip-linux", "Main test suite skips targets with linux OS") orelse false;
     const skip_llvm = b.option(bool, "skip-llvm", "Main test suite skips targets that use LLVM backend") orelse false;
 
@@ -423,7 +423,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = skip_libc,
@@ -454,7 +454,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = skip_libc,
@@ -477,7 +477,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = true,
@@ -499,7 +499,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = true,
@@ -521,7 +521,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_libc = skip_libc,
@@ -562,7 +562,7 @@ pub fn build(b: *std.Build) !void {
         .skip_freebsd = skip_freebsd,
         .skip_netbsd = skip_netbsd,
         .skip_windows = skip_windows,
-        .skip_macos = skip_macos,
+        .skip_darwin = skip_darwin,
         .skip_linux = skip_linux,
         .skip_llvm = skip_llvm,
         .skip_release = skip_release,

ci/x86_64-freebsd-debug.sh

@@ -49,7 +49,7 @@ stage3-debug/bin/zig build test docs \
   -Dskip-linux \
   -Dskip-netbsd \
   -Dskip-windows \
-  -Dskip-macos \
+  -Dskip-darwin \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \
   --test-timeout 2m

ci/x86_64-freebsd-release.sh

@@ -49,7 +49,7 @@ stage3-release/bin/zig build test docs \
   -Dskip-linux \
   -Dskip-netbsd \
   -Dskip-windows \
-  -Dskip-macos \
+  -Dskip-darwin \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \
   --test-timeout 2m

ci/x86_64-linux-debug-llvm.sh

@@ -57,7 +57,7 @@ stage3-debug/bin/zig build test docs \
   -Dskip-freebsd \
   -Dskip-netbsd \
   -Dskip-windows \
-  -Dskip-macos \
+  -Dskip-darwin \
   -Dtarget=native-native-musl \
   --search-prefix "$PREFIX" \
   --zig-lib-dir "$PWD/../lib" \

ci/x86_64-linux-debug.sh

@@ -56,7 +56,7 @@ stage3-debug/bin/zig build test docs \
   -Dskip-freebsd \
   -Dskip-netbsd \
   -Dskip-windows \
-  -Dskip-macos \
+  -Dskip-darwin \
   -Dskip-llvm \
   -Dtarget=native-native-musl \
   --search-prefix "$PREFIX" \