Commit 130310972d41eed50d7f033bb2a71c3eb2467439 | zig

author	Alex Rønne Petersen <alex@alexrp.com> 2024-12-13 07:58:13+01:00
committer	Alex Rønne Petersen <alex@alexrp.com> 2024-12-22 22:06:00+01:00
log	130310972d41eed50d7f033bb2a71c3eb2467439
tree	843a3ab3801e7b4e7dbfde4ea1edc1f78c7ba820
parent	0ef01c552100a8559bec5d17e6778f1cb652d403
signature	Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

compiler: Print more information when failing to provide libc.

1 files changed, 14 insertions(+), 7 deletions(-)

src
- main.zig

src/main.zig+14-7

 @@ -3550,21 +3550,28 @@ fn buildOutputType(
             for (std.zig.target.available_libcs) |t| {
                 if (t.arch == target.cpu.arch and t.os == target.os.tag) {
-                    if (t.os_ver) |os_ver| {
+                    // If there's a `glibc_min`, there's also an `os_ver`.
-                        std.log.info("zig can provide libc for related target {s}-{s}.{d}-{s}", .{
+                    if (t.glibc_min) |glibc_min| {
-                            @tagName(t.arch), @tagName(t.os), os_ver.major, @tagName(t.abi),
+                        std.log.info("zig can provide libc for related target {s}-{s}.{}-{s}.{d}.{d}", .{
-                        });
-                    } else if (t.glibc_min) |glibc_min| {
-                        std.log.info("zig can provide libc for related target {s}-{s}-{s}.{d}.{d}", .{
                             @tagName(t.arch),
                             @tagName(t.os),
+                            t.os_ver.?,
                             @tagName(t.abi),
                             glibc_min.major,
                             glibc_min.minor,
                         });
+                    } else if (t.os_ver) |os_ver| {
+                        std.log.info("zig can provide libc for related target {s}-{s}.{}-{s}", .{
+                            @tagName(t.arch),
+                            @tagName(t.os),
+                            os_ver,
+                            @tagName(t.abi),
+                        });
                     } else {
                         std.log.info("zig can provide libc for related target {s}-{s}-{s}", .{
-                            @tagName(t.arch), @tagName(t.os), @tagName(t.abi),
+                            @tagName(t.arch),
+                            @tagName(t.os),
+                            @tagName(t.abi),
                         });
                     }
                 }