authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-10-28 19:26:42-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-10-29 09:27:38-07:00
log7025c06eb6102117ec472cac4586a3841bdb6fa8
treefce36e21ca675a491fad01b1629fc1d4ff4b95ae
parenta03ab9ee01129913af526a38b688313ccd83dca2

CLI: don't warn on missing host-detected directories


1 files changed, 10 insertions(+), 1 deletions(-)

src/main.zig+10-1
...@@ -3928,7 +3928,7 @@ fn createModule(...@@ -3928,7 +3928,7 @@ fn createModule(
3928 try create_module.rpath_list.appendSlice(arena, paths.rpaths.items);3928 try create_module.rpath_list.appendSlice(arena, paths.rpaths.items);
39293929
3930 try create_module.lib_directories.ensureUnusedCapacity(arena, paths.lib_dirs.items.len);3930 try create_module.lib_directories.ensureUnusedCapacity(arena, paths.lib_dirs.items.len);
3931 for (paths.lib_dirs.items) |path| addLibDirectoryWarn(&create_module.lib_directories, path);3931 for (paths.lib_dirs.items) |path| addLibDirectoryWarn2(&create_module.lib_directories, path, true);
3932 }3932 }
39333933
3934 if (create_module.libc_paths_file) |paths_file| {3934 if (create_module.libc_paths_file) |paths_file| {
...@@ -7479,8 +7479,17 @@ fn anyObjectLinkInputs(link_inputs: []const link.UnresolvedInput) bool {...@@ -7479,8 +7479,17 @@ fn anyObjectLinkInputs(link_inputs: []const link.UnresolvedInput) bool {
7479}7479}
74807480
7481fn addLibDirectoryWarn(lib_directories: *std.ArrayListUnmanaged(Directory), path: []const u8) void {7481fn addLibDirectoryWarn(lib_directories: *std.ArrayListUnmanaged(Directory), path: []const u8) void {
7482 return addLibDirectoryWarn2(lib_directories, path, false);
7483}
7484
7485fn addLibDirectoryWarn2(
7486 lib_directories: *std.ArrayListUnmanaged(Directory),
7487 path: []const u8,
7488 ignore_not_found: bool,
7489) void {
7482 lib_directories.appendAssumeCapacity(.{7490 lib_directories.appendAssumeCapacity(.{
7483 .handle = fs.cwd().openDir(path, .{}) catch |err| {7491 .handle = fs.cwd().openDir(path, .{}) catch |err| {
7492 if (err == error.FileNotFound and ignore_not_found) return;
7484 warn("unable to open library directory '{s}': {s}", .{ path, @errorName(err) });7493 warn("unable to open library directory '{s}': {s}", .{ path, @errorName(err) });
7485 return;7494 return;
7486 },7495 },