authorgravatar for michael.dusan@gmail.comMichael Dusan <michael.dusan@gmail.com> 2025-12-20 08:30:52-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-12-23 22:15:11-08:00
log8fdfeb624dae7d60187c7a2c44c9624cca1bd461
tree58e0ee52f1fcd6f2337b8553354379030903acd3
parent90bc371f564f7992a5137abddd958b012f8855e6

openbsd: fix OS version detection

- do not include resulting nullz from sysctl MIB fetch - fixes bug: "7.8<NULL>" is a std.Target.Query.parseVersion error

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

lib/compiler_rt/emutls.zig+1-1
...@@ -7,7 +7,7 @@ const std = @import("std");...@@ -7,7 +7,7 @@ const std = @import("std");
7const builtin = @import("builtin");7const builtin = @import("builtin");
8const common = @import("common.zig");8const common = @import("common.zig");
99
10const abort = std.posix.abort;10const abort = std.process.abort;
11const assert = std.debug.assert;11const assert = std.debug.assert;
12const expect = std.testing.expect;12const expect = std.testing.expect;
1313
lib/std/zig/system.zig+1-1
...@@ -323,7 +323,7 @@ pub fn resolveTargetQuery(io: Io, query: Target.Query) DetectError!Target {...@@ -323,7 +323,7 @@ pub fn resolveTargetQuery(io: Io, query: Target.Query) DetectError!Target {
323 error.Unexpected => return error.OSVersionDetectionFail,323 error.Unexpected => return error.OSVersionDetectionFail,
324 };324 };
325325
326 if (Target.Query.parseVersion(buf[0..len :0])) |ver| {326 if (Target.Query.parseVersion(buf[0 .. len - 1 :0])) |ver| {
327 assert(ver.build == null);327 assert(ver.build == null);
328 assert(ver.pre == null);328 assert(ver.pre == null);
329 os.version_range.semver.min = ver;329 os.version_range.semver.min = ver;