authorgravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2021-02-06 20:12:09-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2021-02-06 20:12:09-05:00
log905c85be968e6823305887474d2a821dac82f16c
treead8a0c24c183083c8dace9a1bc14698668afa41b
parent300ebbd56090d7c96478293354e24c0f3341ec85
parentfc79cbcc80c67dac5c44697ab1b3ec7b548c715c
signature Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #7957 from mk12/catalina

Use -isysroot on Catalina too, not just Big Sur

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

src/main.zig+3-2
...@@ -1536,8 +1536,9 @@ fn buildOutputType(...@@ -1536,8 +1536,9 @@ fn buildOutputType(
1536 }1536 }
15371537
1538 const has_sysroot = if (comptime std.Target.current.isDarwin()) outer: {1538 const has_sysroot = if (comptime std.Target.current.isDarwin()) outer: {
1539 const at_least_big_sur = target_info.target.os.getVersionRange().semver.min.major >= 11;1539 const min = target_info.target.os.getVersionRange().semver.min;
1540 if (at_least_big_sur) {1540 const at_least_catalina = min.major >= 11 or (min.major >= 10 and min.minor >= 15);
1541 if (at_least_catalina) {
1541 const sdk_path = try std.zig.system.getSDKPath(arena);1542 const sdk_path = try std.zig.system.getSDKPath(arena);
1542 try clang_argv.ensureCapacity(clang_argv.items.len + 2);1543 try clang_argv.ensureCapacity(clang_argv.items.len + 2);
1543 clang_argv.appendAssumeCapacity("-isysroot");1544 clang_argv.appendAssumeCapacity("-isysroot");