authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-01 01:17:50-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-03-01 01:17:50-05:00
logf082e253b56b98a806e5ec047c5eb197b2c8ab88
tree522798600cfa1b62f63ede8f052b9154c02f33f4
parent22468121849e902a0ac2435af21fb9c773c7bcc4

fix native OS version detection on macOS

closes #4583

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

lib/std/zig/system.zig+3-2
...@@ -232,7 +232,7 @@ pub const NativeTargetInfo = struct {...@@ -232,7 +232,7 @@ pub const NativeTargetInfo = struct {
232 // supports232 // supports
233 std.os.sysctlbynameC(233 std.os.sysctlbynameC(
234 "kern.osproductversion",234 "kern.osproductversion",
235 &product_version[0],235 &product_version,
236 &size,236 &size,
237 null,237 null,
238 0,238 0,
...@@ -241,7 +241,8 @@ pub const NativeTargetInfo = struct {...@@ -241,7 +241,8 @@ pub const NativeTargetInfo = struct {
241 else => unreachable,241 else => unreachable,
242 };242 };
243243
244 if (std.builtin.Version.parse(product_version[0..size])) |ver| {244 const string_version = product_version[0 .. size - 1 :0];
245 if (std.builtin.Version.parse(string_version)) |ver| {
245 os.version_range.semver.min = ver;246 os.version_range.semver.min = ver;
246 os.version_range.semver.max = ver;247 os.version_range.semver.max = ver;
247 } else |err| switch (err) {248 } else |err| switch (err) {