From ff24d73096cde9792b6156825ad368981e948e2b Mon Sep 17 00:00:00 2001 From: Matthew Lugg Date: Fri, 14 Aug 2026 12:09:38 +0100 Subject: [PATCH] Maker: fix hidden merge conflict There was a silent merge conflict in https://codeberg.org/ziglang/zig/pulls/36454 leading to build failures in Maker. Fixes: 5d7cf3f34d13f70de35c2f76db2e44073e6de64e --- lib/compiler/Maker.zig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/compiler/Maker.zig b/lib/compiler/Maker.zig index dbb40ec694cd1e0914a6c3688ee4f0307e1efd3b..57d1b7c27529c1e88f594c011f16990f85f670ac 100644 --- a/lib/compiler/Maker.zig +++ b/lib/compiler/Maker.zig @@ -682,7 +682,7 @@ pub fn main(init: process.Init.Minimal) !void { var web_server_allocation: AvoidableWebServer = undefined; const web_server: ?*AvoidableWebServer = if (webui_listen) |listen_address| ws: { - if (watch) fatal("using '--webui' and '--watch' together is not yet supported; consider omitting '--watch' in favour of the web UI \"Rebuild\" button", .{}); + if (watch_flag) fatal("using '--webui' and '--watch' together is not yet supported; consider omitting '--watch' in favour of the web UI \"Rebuild\" button", .{}); if (builtin.single_threaded) fatal("--webui is not yet supported on single-threaded hosts", .{}); web_server_allocation = .init(.{ .graph = &graph, -- 2.54.0