authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-08 18:24:14-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-01-08 18:24:14-07:00
logcf5a5dc8b521a145112e9619563cc72d3c26c0e9
treeda1126bf57e1f8f119f7b5f443836c975e8f2299
parent3023d2845c6906fac9522d2e94a6811f7dabbe78

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

They were being resolved relative to the wrong owner. closes #18460

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

lib/std/Build/Step/Compile.zig+4-4
...@@ -993,7 +993,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {...@@ -993,7 +993,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
993 switch (link_object) {993 switch (link_object) {
994 .static_path => |static_path| {994 .static_path => |static_path| {
995 if (my_responsibility) {995 if (my_responsibility) {
996 try zig_args.append(static_path.getPath(b));996 try zig_args.append(static_path.getPath2(module.owner, step));
997 total_linker_objects += 1;997 total_linker_objects += 1;
998 }998 }
999 },999 },
...@@ -1113,7 +1113,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {...@@ -1113,7 +1113,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
1113 try zig_args.append("--");1113 try zig_args.append("--");
1114 prev_has_cflags = false;1114 prev_has_cflags = false;
1115 }1115 }
1116 try zig_args.append(asm_file.getPath(b));1116 try zig_args.append(asm_file.getPath2(module.owner, step));
1117 total_linker_objects += 1;1117 total_linker_objects += 1;
1118 },1118 },
11191119
...@@ -1134,7 +1134,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {...@@ -1134,7 +1134,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
1134 try zig_args.append("--");1134 try zig_args.append("--");
1135 prev_has_cflags = true;1135 prev_has_cflags = true;
1136 }1136 }
1137 try zig_args.append(c_source_file.file.getPath(b));1137 try zig_args.append(c_source_file.file.getPath2(module.owner, step));
1138 total_linker_objects += 1;1138 total_linker_objects += 1;
1139 },1139 },
11401140
...@@ -1185,7 +1185,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {...@@ -1185,7 +1185,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
1185 try zig_args.append("--");1185 try zig_args.append("--");
1186 prev_has_rcflags = true;1186 prev_has_rcflags = true;
1187 }1187 }
1188 try zig_args.append(rc_source_file.file.getPath(b));1188 try zig_args.append(rc_source_file.file.getPath2(module.owner, step));
1189 total_linker_objects += 1;1189 total_linker_objects += 1;
1190 },1190 },
1191 }1191 }