authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-01-07 23:46:10+01:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-01-07 23:47:37-08:00
log70771283c53918bff8064c3d35beab4cc4095db5
treec8ced6c448c3c2c719f764956726b9cf2b264f2e
parentc7666ff885feb8407ada301a294d37e31274e977

Want native headers when linking with frameworks

This PR ensures we use system libc headers and system search paths for framework headers when linking against frameworks and compiling natively on macOS.

1 files changed, 6 insertions(+), 0 deletions(-)

src/main.zig+6
...@@ -1432,6 +1432,12 @@ fn buildOutputType(...@@ -1432,6 +1432,12 @@ fn buildOutputType(
1432 }1432 }
1433 }1433 }
14341434
1435 if (comptime std.Target.current.isDarwin()) {
1436 // If we want to link against frameworks, we need system headers.
1437 if (framework_dirs.items.len > 0 or frameworks.items.len > 0)
1438 want_native_include_dirs = true;
1439 }
1440
1435 if (cross_target.isNativeOs() and (system_libs.items.len != 0 or want_native_include_dirs)) {1441 if (cross_target.isNativeOs() and (system_libs.items.len != 0 or want_native_include_dirs)) {
1436 const paths = std.zig.system.NativePaths.detect(arena) catch |err| {1442 const paths = std.zig.system.NativePaths.detect(arena) catch |err| {
1437 fatal("unable to detect native system paths: {s}", .{@errorName(err)});1443 fatal("unable to detect native system paths: {s}", .{@errorName(err)});