motiejus/zig
1
Fork 0
Code Releases Activity

openbsd: fix NativeTargetInfo semver

Browse Source 
- supply ".0" as .Z component and satisfy semver X.Y.Z requirement
- previously only X.Y was supplied and semver parse failed
This commit is contained in:
Michael Dusan
2023-06-23 17:46:57 -04:00
committed by Andrew Kelley
parent 148e2a5a89
commit 1cf06706be
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/std/zig/system/NativeTargetInfo.zig
View File

@@ -132,7 +132,9 @@ pub fn detect(cross_target: CrossTarget) DetectError!NativeTargetInfo {
std.os.KERN.OSRELEASE,
};
var buf: [64]u8 = undefined;
var len: usize = buf.len;
// consider that sysctl result includes null-termination
// reserve 1 byte to ensure we never overflow when appending ".0"
var len: usize = buf.len - 1;
std.os.sysctl(&mib, &buf, &len, null, 0) catch |err| switch (err) {
error.NameTooLong => unreachable, // constant, known good value
@@ -142,7 +144,12 @@ pub fn detect(cross_target: CrossTarget) DetectError!NativeTargetInfo {
error.Unexpected => return error.OSVersionDetectionFail,
};
if (std.SemanticVersion.parse(buf[0 .. len - 1])) |ver| {
// append ".0" to satisfy semver
buf[len - 1] = '.';
buf[len] = '0';
len += 1;
if (std.SemanticVersion.parse(buf[0..len])) |ver| {
os.version_range.semver.min = ver;
os.version_range.semver.max = ver;
} else |_| {