From cf5a5dc8b521a145112e9619563cc72d3c26c0e9 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 8 Jan 2024 18:24:14 -0700 Subject: [PATCH] std.Build.Step.Compile: fix link object paths They were being resolved relative to the wrong owner. closes #18460 --- lib/std/Build/Step/Compile.zig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/std/Build/Step/Compile.zig b/lib/std/Build/Step/Compile.zig index b001891b39..58e6b7e8cb 100644 --- a/lib/std/Build/Step/Compile.zig +++ b/lib/std/Build/Step/Compile.zig @@ -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; }, }