authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-08-04 23:28:57+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-08-05 17:07:13-07:00
log011a468381a0217bff7f98817c0df593cbcc85ec
treea27da63090ce06b3b6544d1b3e313bdf33e3b314
parentbd8baefaaad97d3ec3c47163113e4b5778ef83b4

Link system libc if natively linking frameworks on macOS

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

src/Compilation.zig+1-3
...@@ -944,8 +944,6 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {...@@ -944,8 +944,6 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
944 if (options.sysroot) |sysroot| {944 if (options.sysroot) |sysroot| {
945 break :blk sysroot;945 break :blk sysroot;
946 } else if (darwin_can_use_system_sdk) {946 } else if (darwin_can_use_system_sdk) {
947 // TODO Revisit this targeting versions lower than macOS 11 when LLVM 12 is out.
948 // See https://github.com/ziglang/zig/issues/6996
949 const at_least_big_sur = options.target.os.getVersionRange().semver.min.major >= 11;947 const at_least_big_sur = options.target.os.getVersionRange().semver.min.major >= 11;
950 break :blk if (at_least_big_sur) try std.zig.system.getSDKPath(arena) else null;948 break :blk if (at_least_big_sur) try std.zig.system.getSDKPath(arena) else null;
951 } else {949 } else {
...@@ -1029,7 +1027,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {...@@ -1029,7 +1027,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
1029 options.target,1027 options.target,
1030 options.is_native_abi,1028 options.is_native_abi,
1031 link_libc,1029 link_libc,
1032 options.system_libs.len != 0,1030 options.system_libs.len != 0 or options.frameworks.len != 0,
1033 options.libc_installation,1031 options.libc_installation,
1034 );1032 );
10351033