From 39342e6ce73467474388ad53fc1f897862b53064 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Wed, 24 Jun 2026 20:16:41 -0700
Subject: [PATCH] Maker: set web_server field earlier

---
 lib/compiler/Maker.zig | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/compiler/Maker.zig b/lib/compiler/Maker.zig
index eac82740a9f95032b813acbaad92e8ba0bee6b46..cb252f1509713ecf1ae6fc88f8f7783cf3bd4d24 100644
--- a/lib/compiler/Maker.zig
+++ b/lib/compiler/Maker.zig
@@ -724,7 +724,7 @@ pub fn main(init: process.Init.Minimal) !void {
                 .unit_test_timeout_ns = test_timeout_ns,
 
                 .watch = watch,
-                .web_server = undefined, // set after `prepare`
+                .web_server = web_server,
                 .memory_blocked_steps = .empty,
                 .step_stack = .empty,
                 .pkg_config = .{ .debug = debug_pkg_config },
@@ -745,6 +745,8 @@ pub fn main(init: process.Init.Minimal) !void {
 
             maker.prepare(step_names.items) catch |err| switch (err) {
                 error.DependencyLoopDetected, error.InsufficientMemory => {
+                    // TODO handle DependencyLoopDetected as error.FailedButCacheIntact
+                    // and handle InsufficientMemory as error.AlreadyReported
                     _ = io.lockStderr(&.{}, graph.stderr_mode) catch {};
                     process.exit(1);
                 },
@@ -838,7 +840,10 @@ pub fn main(init: process.Init.Minimal) !void {
                     break :w false;
                 },
             };
-            if (!server_mode) process.exit(1);
+            if (!server_mode) {
+                _ = io.lockStderr(&.{}, graph.stderr_mode) catch {};
+                process.exit(1);
+            }
             if (can_fs_watch) {
                 @panic("TODO set up fs watching");
             } else {
-- 
2.54.0