authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-03-13 18:52:18-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-03-15 10:48:15-07:00
log0f88ad8c72797b1bc8899e2eb1d1c1c07a39addf
tree3e2104dbecd8a9d0f4d2489cf0cdab639780278c
parent171977dc1c9d15a405b70bfa980c7d188410979e

std.Build.CompileStep: proper step dependency on headers

Rather than calling make() from within make().

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

lib/std/Build/CompileStep.zig+4-3
......@@ -1112,6 +1112,10 @@ fn linkLibraryOrObject(self: *CompileStep, other: *CompileStep) void {
11121112 self.step.dependOn(&other.step);
11131113 self.link_objects.append(.{ .other_step = other }) catch @panic("OOM");
11141114 self.include_dirs.append(.{ .other_step = other }) catch @panic("OOM");
1115
1116 for (other.installed_headers.items) |install_step| {
1117 self.step.dependOn(install_step);
1118 }
11151119}
11161120
11171121fn appendModuleArgs(
......@@ -1699,9 +1703,6 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
16991703 try zig_args.append(fs.path.dirname(h_path).?);
17001704 }
17011705 if (other.installed_headers.items.len > 0) {
1702 for (other.installed_headers.items) |install_step| {
1703 try install_step.make(prog_node);
1704 }
17051706 try zig_args.append("-I");
17061707 try zig_args.append(b.pathJoin(&.{
17071708 other.step.owner.install_prefix, "include",