Commit 26486c7f235596ffdcbfcd44283a787b049561b8 | zig

author	Andrew Kelley <andrew@ziglang.org> 2023-02-16 15:08:37-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-03-15 10:48:12-07:00
log	26486c7f235596ffdcbfcd44283a787b049561b8
tree	d2e2088967cd929cd32f5785fe2be3eb22ff0f56
parent	c5edd8b7f87f8432bbf058b3456393793118906e

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

lib/build_runner.zig+9-4

 @@ -428,16 +428,21 @@ fn workerMakeOneStep(
     // For example, CompileStep does some sus things with modifying the saved
     // *Build object in install header steps that might be able to be removed
     // by passing the *Build object through the make() functions.
-    s.make() catch |err| {
+    const make_result = s.make();
-        s.result.err_code = err;
-        @atomicStore(Step.State, &s.state, .failure, .SeqCst);
+    // No matter the result, we want to display error/warning messages.
+    if (s.result.error_msgs.items.len > 0) {
         sub_prog_node.context.lock_stderr();
         defer sub_prog_node.context.unlock_stderr();
         for (s.result.error_msgs.items) |msg| {
-            std.io.getStdErr().writeAll(msg) catch return;
+            std.io.getStdErr().writeAll(msg) catch break;
         }
+    }
+    make_result catch |err| {
+        s.result.err_code = err;
+        @atomicStore(Step.State, &s.state, .failure, .SeqCst);
         return;
     };