diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-11-08 17:50:19 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-11-08 18:51:12 -0700 |
| commit | 4d67c3d8878b99fc7b5912dafc50c9a5c01ba169 (patch) | |
| tree | fd279882a4a9eceef0bb81f1f52a2a037fd6f59a /src | |
| parent | 4236518e3a53b510f8beb5ca67ec1baebcd07158 (diff) | |
| download | zig-4d67c3d8878b99fc7b5912dafc50c9a5c01ba169.tar.gz zig-4d67c3d8878b99fc7b5912dafc50c9a5c01ba169.zip | |
macOS: depend on bundled headers even for native
This is an alternate fix for #6773. Reverts
872bc787b56f71e53c80f4681523bc8356915b71.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Compilation.zig | 4 | ||||
| -rw-r--r-- | src/target.zig | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 36847f0437..65fa296ca4 100644 --- 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 index da022760e7..66da1710c0 100644 --- 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, |