zig

commit 4d67c3d8878b99fc7b5912dafc50c9a5c01ba169 (tree)
parent 4236518e3a53b510f8beb5ca67ec1baebcd07158
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Sun,  8 Nov 2020 17:50:19 -0700

macOS: depend on bundled headers even for native

This is an alternate fix for #6773. Reverts
872bc787b56f71e53c80f4681523bc8356915b71.

Diffstat:
M
src/Compilation.zig
 | 
4
+---
M
src/target.zig
 | 
7
+++++--

2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/Compilation.zig b/src/Compilation.zig
@@ -2147,9 +2147,7 @@ fn detectLibCIncludeDirs(
         return detectLibCFromLibCInstallation(arena, target, lci);
     }
 
-    if (target_util.canBuildLibC(target)) outer: {
-        if (is_native_os and target.isDarwin()) break :outer; // If we're on Darwin, we want to use native since we only have headers.
-
+    if (target_util.canBuildLibC(target)) {
         const generic_name = target_util.libCGenericName(target);
         // Some architectures are handled by the same set of headers.
         const arch_name = if (target.abi.isMusl()) target_util.archMuslName(target.cpu.arch) else @tagName(target.cpu.arch);
diff --git a/src/target.zig b/src/target.zig
@@ -58,8 +58,11 @@ pub const available_libcs = [_]ArchOsAbi{
 };
 
 pub fn libCGenericName(target: std.Target) [:0]const u8 {
-    if (target.os.tag == .windows)
-        return "mingw";
+    switch (target.os.tag) {
+        .windows => return "mingw",
+        .macos, .ios, .tvos, .watchos => return "darwin",
+        else => {},
+    }
     switch (target.abi) {
         .gnu,
         .gnuabin32,