authorgravatar for mk12360@gmail.comMitchell Kember <mk12360@gmail.com> 2021-02-05 02:45:25-05:00
committergravatar for mk12360@gmail.comMitchell Kember <mk12360@gmail.com> 2021-02-06 16:32:32-05:00
logfc79cbcc80c67dac5c44697ab1b3ec7b548c715c
tree5869a2e1cbd34352615bc52f1770bcdfefe615de
parent8661a13b748d25d796c0246dad7ad2584d9b0824

Use -isysroot on Catalina too, not just Big Sur

This amends #7506 to apply to macOS versions since Catalina (10.15), rather than since Big Sur (11.0).

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

src/main.zig+3-2
......@@ -1536,8 +1536,9 @@ fn buildOutputType(
15361536 }
15371537
15381538 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;
1540 if (at_least_big_sur) {
1539 const min = target_info.target.os.getVersionRange().semver.min;
1540 const at_least_catalina = min.major >= 11 or (min.major >= 10 and min.minor >= 15);
1541 if (at_least_catalina) {
15411542 const sdk_path = try std.zig.system.getSDKPath(arena);
15421543 try clang_argv.ensureCapacity(clang_argv.items.len + 2);
15431544 clang_argv.appendAssumeCapacity("-isysroot");