motiejus/zig
1
Fork 0
Code Releases Activity

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

Browse Source
This commit is contained in:
Jakub Konka
2024-01-14 23:07:21 +01:00
parent d7c2324cdb
commit a8b9f0cf22
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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