diff options
| author | Michael Dusan <michael.dusan@gmail.com> | 2021-02-06 20:12:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-06 20:12:09 -0500 |
| commit | 905c85be968e6823305887474d2a821dac82f16c (patch) | |
| tree | ad8a0c24c183083c8dace9a1bc14698668afa41b /src/main.zig | |
| parent | 300ebbd56090d7c96478293354e24c0f3341ec85 (diff) | |
| parent | fc79cbcc80c67dac5c44697ab1b3ec7b548c715c (diff) | |
| download | zig-905c85be968e6823305887474d2a821dac82f16c.tar.gz zig-905c85be968e6823305887474d2a821dac82f16c.zip | |
Merge pull request #7957 from mk12/catalina
Use -isysroot on Catalina too, not just Big Sur
Diffstat (limited to 'src/main.zig')
| -rw-r--r-- | src/main.zig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main.zig b/src/main.zig index bfe0d6786b..14f63d9911 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1536,8 +1536,9 @@ fn buildOutputType( } const has_sysroot = if (comptime std.Target.current.isDarwin()) outer: { - const at_least_big_sur = target_info.target.os.getVersionRange().semver.min.major >= 11; - if (at_least_big_sur) { + const min = target_info.target.os.getVersionRange().semver.min; + const at_least_catalina = min.major >= 11 or (min.major >= 10 and min.minor >= 15); + if (at_least_catalina) { const sdk_path = try std.zig.system.getSDKPath(arena); try clang_argv.ensureCapacity(clang_argv.items.len + 2); clang_argv.appendAssumeCapacity("-isysroot"); |