From 130310972d41eed50d7f033bb2a71c3eb2467439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Fri, 13 Dec 2024 07:58:13 +0100 Subject: [PATCH] compiler: Print more information when failing to provide libc. --- src/main.zig | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main.zig b/src/main.zig index 1d0f15f8fd..cd9eba1b5e 100644 --- a/src/main.zig +++ b/src/main.zig @@ -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| { - std.log.info("zig can provide libc for related target {s}-{s}.{d}-{s}", .{ - @tagName(t.arch), @tagName(t.os), os_ver.major, @tagName(t.abi), - }); - } else if (t.glibc_min) |glibc_min| { - std.log.info("zig can provide libc for related target {s}-{s}-{s}.{d}.{d}", .{ + // If there's a `glibc_min`, there's also an `os_ver`. + 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), }); } }