Commit ff24d73096cde9792b6156825ad368981e948e2b | zig

author	Matthew Lugg <mlugg@mlugg.co.uk> 2026-08-14 12:09:38+01:00
committer	Matthew Lugg <mlugg@mlugg.co.uk> 2026-08-14 12:09:38+01:00
log	ff24d73096cde9792b6156825ad368981e948e2b
tree	a5879758c796586ead87084c94f070a1a2a8396c
parent	e78dfccb5660603143d4df4dec425712a8ec96da
signature	Commit is signed but in an unrecognized format.

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

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

lib
- compiler
  - Maker.zig

lib/compiler/Maker.zig+1-1

...	...	@@ -682,7 +682,7 @@ pub fn main(init: process.Init.Minimal) !void {
682	682
683	683	var web_server_allocation: AvoidableWebServer = undefined;
684	684	const web_server: ?*AvoidableWebServer = if (webui_listen) \|listen_address\| ws: {
685		if (watch) fatal("using '--webui' and '--watch' together is not yet supported; consider omitting '--watch' in favour of the web UI \"Rebuild\" button", .{});
	685	if (watch_flag) fatal("using '--webui' and '--watch' together is not yet supported; consider omitting '--watch' in favour of the web UI \"Rebuild\" button", .{});
686	686	if (builtin.single_threaded) fatal("--webui is not yet supported on single-threaded hosts", .{});
687	687	web_server_allocation = .init(.{
688	688	.graph = &graph,