authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-10-24 14:35:14+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2020-10-24 17:32:50+02:00
log872bc787b56f71e53c80f4681523bc8356915b71
tree8144755a2cc56b886a15cac502b105816b7a7679
parent91a1c20e74a8919b7d96366a5c220af79fe67168

cc: fix regression on macOS after adding libc headers

Signed-off-by: Jakub Konka <kubkon@jakubkonka.com>

1 files changed, 3 insertions(+), 1 deletions(-)

src/Compilation.zig+3-1
...@@ -2127,7 +2127,9 @@ fn detectLibCIncludeDirs(...@@ -2127,7 +2127,9 @@ fn detectLibCIncludeDirs(
2127 return detectLibCFromLibCInstallation(arena, target, lci);2127 return detectLibCFromLibCInstallation(arena, target, lci);
2128 }2128 }
21292129
2130 if (target_util.canBuildLibC(target)) {2130 if (target_util.canBuildLibC(target)) outer: {
2131 if (is_native_os and target.isDarwin()) break :outer; // If we're on Darwin, we want to use native since we only have headers.
2132
2131 const generic_name = target_util.libCGenericName(target);2133 const generic_name = target_util.libCGenericName(target);
2132 // Some architectures are handled by the same set of headers.2134 // Some architectures are handled by the same set of headers.
2133 const arch_name = if (target.abi.isMusl()) target_util.archMuslName(target.cpu.arch) else @tagName(target.cpu.arch);2135 const arch_name = if (target.abi.isMusl()) target_util.archMuslName(target.cpu.arch) else @tagName(target.cpu.arch);