macOS: depend on bundled headers even for native

This is an alternate fix for #6773. Reverts 872bc78.
ziglang · Nov 9, 2020 · 9a3e726 · 9a3e726
1 parent 4236518
commit 9a3e726
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/Compilation.zig b/src/Compilation.zig
@@ -2148,8 +2148,6 @@ fn detectLibCIncludeDirs(
     }
 
     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.
-
         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,