authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-08-23 21:46:36-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-08-23 21:46:36-07:00
logd9e8671d963dc99ec8b4721f53d77828efa232ed
tree861acf53602452698c82a1bfa2b69f347292a4c2
parent03c297eea63b403371428bdf2bbf91fcdca8a071

fix merge conflict from previous commit

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

lib/std/Build.zig+1-1
...@@ -1808,7 +1808,7 @@ pub fn runAllowFail(...@@ -1808,7 +1808,7 @@ pub fn runAllowFail(
1808 child.stderr_behavior = stderr_behavior;1808 child.stderr_behavior = stderr_behavior;
1809 child.env_map = &b.graph.env_map;1809 child.env_map = &b.graph.env_map;
18101810
1811 try Step.handleVerbose2(self, null, child.env_map, argv);1811 try Step.handleVerbose2(b, null, child.env_map, argv);
1812 try child.spawn();1812 try child.spawn();
18131813
1814 const stdout = child.stdout.?.reader().readAllAlloc(b.allocator, max_output_size) catch {1814 const stdout = child.stdout.?.reader().readAllAlloc(b.allocator, max_output_size) catch {