zig

commit 39841d5e2c97a6b04834ae82a30db27cff01f17f (tree)
parent 47d7bf1a0e9776e8695053b12795020644c2b006
Author: Rocknest <35231115+Rocknest@users.noreply.github.com>
Date:   Sun, 11 Oct 2020 16:46:29 +0300

remove workaround

Diffstat:
M
lib/std/builtin.zig
 | 
1
+
M
lib/std/zig/system.zig
 | 
13
+++----------

2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/lib/std/builtin.zig b/lib/std/builtin.zig
@@ -567,6 +567,7 @@ pub fn testVersionParse() !void {
     try f.eql("2.7.pre", 2, 7, 0);
     try f.eql("0..3", 0, 0, 0);
     try f.eql("8.008.", 8, 8, 0);
+    try f.eql("01...", 1, 0, 0);
     try f.eql("55", 55, 0, 0);
     try f.eql("4294967295.0.1", 4294967295, 0, 1);
     try f.eql("429496729_6", 429496729, 0, 0);
diff --git a/lib/std/zig/system.zig b/lib/std/zig/system.zig
@@ -209,16 +209,9 @@ pub const NativeTargetInfo = struct {
                 .linux => {
                     const uts = std.os.uname();
                     const release = mem.spanZ(&uts.release);
-                    // The release field may have several other fields after the
-                    // kernel version
-                    const kernel_version = if (mem.indexOfScalar(u8, release, '-')) |pos|
-                        release[0..pos]
-                    else if (mem.indexOfScalar(u8, release, '_')) |pos|
-                        release[0..pos]
-                    else
-                        release;
-
-                    if (std.builtin.Version.parse(kernel_version)) |ver| {
+                    // The release field sometimes has a weird format,
+                    // `Version.parse` will attempt to find some meaningful interpretation. 
+                    if (std.builtin.Version.parse(release)) |ver| {
                         os.version_range.linux.range.min = ver;
                         os.version_range.linux.range.max = ver;
                     } else |err| switch (err) {