mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-20 00:08:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
They were being resolved relative to the wrong owner.

closes #18460
This commit is contained in:
Andrew Kelley 2024-01-08 18:24:14 -07:00
parent 3023d2845c
commit cf5a5dc8b5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/std/Build/Step/Compile.zig
View File

@ -993,7 +993,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
switch (link_object) {
.static_path => |static_path| {
if (my_responsibility) {
try zig_args.append(static_path.getPath(b));
try zig_args.append(static_path.getPath2(module.owner, step));
total_linker_objects += 1;
}
},
@ -1113,7 +1113,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
try zig_args.append("--");
prev_has_cflags = false;
}
try zig_args.append(asm_file.getPath(b));
try zig_args.append(asm_file.getPath2(module.owner, step));
total_linker_objects += 1;
},
@ -1134,7 +1134,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
try zig_args.append("--");
prev_has_cflags = true;
}
try zig_args.append(c_source_file.file.getPath(b));
try zig_args.append(c_source_file.file.getPath2(module.owner, step));
total_linker_objects += 1;
},
@ -1185,7 +1185,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
try zig_args.append("--");
prev_has_rcflags = true;
}
try zig_args.append(rc_source_file.file.getPath(b));
try zig_args.append(rc_source_file.file.getPath2(module.owner, step));
total_linker_objects += 1;
},
}