authorgravatar for michael.larouche@gmail.commlarouche <michael.larouche@gmail.com> 2020-10-18 16:42:03-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-10-25 21:33:46-04:00
loge3fed3c8141805702146601bc889341638a9c64e
treee636de7a972c3f731b26f878ca602dc9d0244501
parent0a619c68a651db80c68cfe3a0f0a9682a845f7e7

Temp Fix for deadlock in C compilation, found and tested on Windows

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

src/Compilation.zig+3-3
...@@ -1640,16 +1640,16 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_comp_progress_node: *...@@ -1640,16 +1640,16 @@ fn updateCObject(comp: *Compilation, c_object: *CObject, c_comp_progress_node: *
1640 }1640 }
1641 } else {1641 } else {
1642 child.stdin_behavior = .Ignore;1642 child.stdin_behavior = .Ignore;
1643 child.stdout_behavior = .Pipe;1643 child.stdout_behavior = .Ignore;
1644 child.stderr_behavior = .Pipe;1644 child.stderr_behavior = .Pipe;
16451645
1646 try child.spawn();1646 try child.spawn();
16471647
1648 const stdout_reader = child.stdout.?.reader();
1649 const stderr_reader = child.stderr.?.reader();1648 const stderr_reader = child.stderr.?.reader();
16501649
1651 // TODO https://github.com/ziglang/zig/issues/63431650 // TODO https://github.com/ziglang/zig/issues/6343
1652 const stdout = try stdout_reader.readAllAlloc(arena, std.math.maxInt(u32));1651 // Please uncomment and use stdout once this issue is fixed
1652 // const stdout = try stdout_reader.readAllAlloc(arena, std.math.maxInt(u32));
1653 const stderr = try stderr_reader.readAllAlloc(arena, 10 * 1024 * 1024);1653 const stderr = try stderr_reader.readAllAlloc(arena, 10 * 1024 * 1024);
16541654
1655 const term = child.wait() catch |err| {1655 const term = child.wait() catch |err| {