authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-09 01:11:15-08:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-01-09 01:11:15-08:00
log60094cc3fc979df0928c412c9fded457172f2060
treea5dae37962a8cf38d257609a87b7dce5dc2e579d
parentf12ec02bd780f58d8c35b1fe80e0955c2591e0a4
parentcf5a5dc8b521a145112e9619563cc72d3c26c0e9
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #18491 from ziglang/fix-mod-link-obj-path

std.Build.Step.Compile: fix link object paths

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

lib/std/Build/Step/Compile.zig+4-4
......@@ -999,7 +999,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
999999 switch (link_object) {
10001000 .static_path => |static_path| {
10011001 if (my_responsibility) {
1002 try zig_args.append(static_path.getPath(b));
1002 try zig_args.append(static_path.getPath2(module.owner, step));
10031003 total_linker_objects += 1;
10041004 }
10051005 },
......@@ -1119,7 +1119,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
11191119 try zig_args.append("--");
11201120 prev_has_cflags = false;
11211121 }
1122 try zig_args.append(asm_file.getPath(b));
1122 try zig_args.append(asm_file.getPath2(module.owner, step));
11231123 total_linker_objects += 1;
11241124 },
11251125
......@@ -1140,7 +1140,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
11401140 try zig_args.append("--");
11411141 prev_has_cflags = true;
11421142 }
1143 try zig_args.append(c_source_file.file.getPath(b));
1143 try zig_args.append(c_source_file.file.getPath2(module.owner, step));
11441144 total_linker_objects += 1;
11451145 },
11461146
......@@ -1191,7 +1191,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
11911191 try zig_args.append("--");
11921192 prev_has_rcflags = true;
11931193 }
1194 try zig_args.append(rc_source_file.file.getPath(b));
1194 try zig_args.append(rc_source_file.file.getPath2(module.owner, step));
11951195 total_linker_objects += 1;
11961196 },
11971197 }
src/Compilation.zig+3-3
......@@ -2055,11 +2055,11 @@ pub fn update(comp: *Compilation, main_progress_node: *std.Progress.Node) !void
20552055 const is_hit = man.hit() catch |err| {
20562056 const i = man.failed_file_index orelse return err;
20572057 const pp = man.files.items[i].prefixed_path orelse return err;
2058 const prefix = man.cache.prefixes()[pp.prefix].path orelse "";
2058 const prefix = man.cache.prefixes()[pp.prefix];
20592059 return comp.setMiscFailure(
20602060 .check_whole_cache,
2061 "unable to check cache: stat file '{}{s}{s}' failed: {s}",
2062 .{ comp.local_cache_directory, prefix, pp.sub_path, @errorName(err) },
2061 "unable to check cache: stat file '{}{s}' failed: {s}",
2062 .{ prefix, pp.sub_path, @errorName(err) },
20632063 );
20642064 };
20652065 if (is_hit) {