authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-01-14 23:07:21+01:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2024-01-14 23:07:21+01:00
loga8b9f0cf2268e0be9551a7d14f76e5e4f1b79527
tree5142e0114c09bc396023e8081bf217187a586537
parentd7c2324cdbcb32e285e03aa7938529b9412c72e6

std/Build/Step/Compile: do not propagate deps of complex addObject step

1 files changed, 2 insertions(+), 3 deletions(-)

lib/std/Build/Step/Compile.zig+2-3
...@@ -1077,9 +1077,8 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {...@@ -1077,9 +1077,8 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
1077 .exe => return step.fail("cannot link with an executable build artifact", .{}),1077 .exe => return step.fail("cannot link with an executable build artifact", .{}),
1078 .@"test" => return step.fail("cannot link with a test", .{}),1078 .@"test" => return step.fail("cannot link with a test", .{}),
1079 .obj => {1079 .obj => {
1080 const included_in_lib = !my_responsibility and1080 const included_in_lib_or_obj = !my_responsibility and (compile.kind == .lib or compile.kind == .obj);
1081 compile.kind == .lib and other.kind == .obj;1081 if (!already_linked and !included_in_lib_or_obj) {
1082 if (!already_linked and !included_in_lib) {
1083 try zig_args.append(other.getEmittedBin().getPath(b));1082 try zig_args.append(other.getEmittedBin().getPath(b));
1084 total_linker_objects += 1;1083 total_linker_objects += 1;
1085 }1084 }