Commit 6e4fff6ba62ae3e61a948c98fa8fea7e35732cc0 | zig

author	Andrew Kelley <andrew@ziglang.org> 2023-07-21 20:29:42-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2023-07-22 00:16:27-07:00
log	6e4fff6ba62ae3e61a948c98fa8fea7e35732cc0
tree	017722866adaf7405fd5a2cc72bc0380334de060
parent	1291f4aca46b2929d9ee9b265a2bfe5311e60861

move installation logic to the build script where it belongs

* build.zig: introduce `-Dflat` option which makes the installation
  match what we want to ship for our download tarballs. This allows
  deleting a bunch of shell script logic from the CI.
  - for example it puts the executable directly in prefix/zig rather
    than prefix/bin/zig and it additionally includes prefix/LICENSE.
* build.zig: by default also install std lib documentation to doc/std/
  - this can be disabled by `-Dno-autodocs` similar to how there is
    already `-Dno-langref`.
* build.zig: add `std-docs` and `langref` steps which build and install
  the std lib autodocs and langref to prefix/doc/std and
  prefix/doc/langref.html, respectively.

* std.Build: implement proper handling of `-femit-docs` using the
  LazyPath system. This is a breaking change.
  - this is a partial implementation of #16351
* frontend: fixed the handling of Autodocs with regards to caching and
  putting the artifacts in the proper location to integrate with the
  build system.
  - closes #15864

* CI: delete the logic for autodocs since it is now handled by build.zig
  and is enabled by default.
  - in the future we should strive to have nearly all the CI shell
    script logic deleted in favor of `zig build` commands.
* CI: pass `-DZIG_NO_LIB=ON`/`-Dno-lib` except for the one command where
  we want to actually generate the langref and autodocs. Generating the
  langref takes 14 minutes right now (why?!) so we don't want to do that
  more times than necessary.

* Autodoc: fixed use of a global variable. It works fine as a local
  variable instead.
  - note that in the future we will want to make Autodoc run
    simultaneously using the job system, but for now the principle of
    YAGNI dictates that we don't have an init()/deinit() API and instead
    simply call the function that does the things.
* Autodoc: only do it when there are no compile errors

16 files changed, 215 insertions(+), 137 deletions(-)

build.zig
ci
lib
- std
  - Build
    Step
    Compile.zig
src

build.zig+43-6

...	...	@@ -24,12 +24,14 @@ pub fn build(b: *std.Build) !void {
24	24
25	25	const optimize = b.standardOptimizeOption(.{});
26	26
	27	const flat = b.option(bool, "flat", "Put files into the installation prefix in a manner suited for upstream distribution rather than a posix file system hierarchy standard") orelse false;
27	28	const single_threaded = b.option(bool, "single-threaded", "Build artifacts that run in single threaded mode");
28	29	const use_zig_libcxx = b.option(bool, "use-zig-libcxx", "If libc++ is needed, use zig's bundled version, don't try to integrate with the system") orelse false;
29	30
30	31	const test_step = b.step("test", "Run all the tests");
31	32	const skip_install_lib_files = b.option(bool, "no-lib", "skip copying of lib/ files and langref to installation prefix. Useful for development") orelse false;
32	33	const skip_install_langref = b.option(bool, "no-langref", "skip copying of langref to the installation prefix") orelse skip_install_lib_files;
	34	const skip_install_autodocs = b.option(bool, "no-autodocs", "skip copying of standard library autodocs to the installation prefix") orelse skip_install_lib_files;
33	35	const no_bin = b.option(bool, "no-bin", "skip emitting compiler binary") orelse false;
34	36
35	37	const docgen_exe = b.addExecutable(.{
...	...	@@ -52,8 +54,34 @@ pub fn build(b: *std.Build) !void {
52	54	b.getInstallStep().dependOn(&install_langref.step);
53	55	}
54	56
55		const docs_step = b.step("docs", "Build documentation");
56		docs_step.dependOn(&docgen_cmd.step);
	57	const autodoc_test = b.addTest(.{
	58	.root_source_file = .{ .path = "lib/std/std.zig" },
	59	.target = target,
	60	});
	61	autodoc_test.overrideZigLibDir("lib");
	62	autodoc_test.emit_bin = .no_emit; // https://github.com/ziglang/zig/issues/16351
	63	const install_std_docs = b.addInstallDirectory(.{
	64	.source_dir = autodoc_test.getOutputDocs(),
	65	.install_dir = .prefix,
	66	.install_subdir = "doc/std",
	67	});
	68	if (!skip_install_autodocs) {
	69	b.getInstallStep().dependOn(&install_std_docs.step);
	70	}
	71
	72	if (flat) {
	73	b.installFile("LICENSE", "LICENSE");
	74	}
	75
	76	const langref_step = b.step("langref", "Build and install the language reference");
	77	langref_step.dependOn(&install_langref.step);
	78
	79	const std_docs_step = b.step("std-docs", "Build and install the standard library documentation");
	80	std_docs_step.dependOn(&install_std_docs.step);
	81
	82	const docs_step = b.step("docs", "Build and install documentation");
	83	docs_step.dependOn(langref_step);
	84	docs_step.dependOn(std_docs_step);
57	85
58	86	const check_case_exe = b.addExecutable(.{
59	87	.name = "check-case",
...	...	@@ -104,10 +132,10 @@ pub fn build(b: *std.Build) !void {
104	132	const config_h_path_option = b.option([]const u8, "config_h", "Path to the generated config.h");
105	133
106	134	if (!skip_install_lib_files) {
107		b.installDirectory(InstallDirectoryOptions{
	135	b.installDirectory(.{
108	136	.source_dir = .{ .path = "lib" },
109		.install_dir = .lib,
110		.install_subdir = "zig",
	137	.install_dir = if (flat) .prefix else .lib,
	138	.install_subdir = if (flat) "lib" else "zig",
111	139	.exclude_extensions = &[_][]const u8{
112	140	// exclude files from lib/std/compress/testdata
113	141	".gz",
...	...	@@ -167,6 +195,9 @@ pub fn build(b: *std.Build) !void {
167	195	exe.pie = pie;
168	196	exe.sanitize_thread = sanitize_thread;
169	197	exe.entitlements = entitlements;
	198	// TODO -femit-bin/-fno-emit-bin should be inferred by the build system
	199	// based on whether or not the exe is run or installed.
	200	// https://github.com/ziglang/zig/issues/16351
170	201	if (no_bin) exe.emit_bin = .no_emit;
171	202
172	203	exe.build_id = b.option(
...	...	@@ -175,7 +206,13 @@ pub fn build(b: *std.Build) !void {
175	206	"Request creation of '.note.gnu.build-id' section",
176	207	);
177	208
178		b.installArtifact(exe);
	209	if (!no_bin) {
	210	const install_exe = b.addInstallArtifact(exe);
	211	if (flat) {
	212	install_exe.dest_dir = .prefix;
	213	}
	214	b.getInstallStep().dependOn(&install_exe.step);
	215	}
179	216
180	217	test_step.dependOn(&exe.step);
181	218

ci/aarch64-linux-debug.sh+9-6

...	...	@@ -40,6 +40,7 @@ cmake .. \
40	40	-DZIG_TARGET_TRIPLE="$TARGET" \
41	41	-DZIG_TARGET_MCPU="$MCPU" \
42	42	-DZIG_STATIC=ON \
	43	-DZIG_NO_LIB=ON \
43	44	-GNinja
44	45
45	46	# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
...	...	@@ -49,16 +50,18 @@ unset CXX
49	50
50	51	ninja install
51	52
	53	# TODO: move this to a build.zig step (check-fmt)
52	54	echo "Looking for non-conforming code formatting..."
53	55	stage3-debug/bin/zig fmt --check .. \
54	56	--exclude ../test/cases/ \
55	57	--exclude ../build-debug
56	58
57	59	# simultaneously test building self-hosted without LLVM and with 32-bit arm
58		stage3-debug/bin/zig build -Dtarget=arm-linux-musleabihf
	60	stage3-debug/bin/zig build \
	61	-Dtarget=arm-linux-musleabihf \
	62	-Dno-lib
59	63
60	64	# TODO: add -fqemu back to this line
61
62	65	stage3-debug/bin/zig build test docs \
63	66	--maxrss 24696061952 \
64	67	-fwasmtime \
...	...	@@ -68,10 +71,8 @@ stage3-debug/bin/zig build test docs \
68	71	--zig-lib-dir "$(pwd)/../lib"
69	72
70	73	# Look for HTML errors.
71		tidy --drop-empty-elements no -qe "stage3-debug/doc/langref.html"
72
73		# Produce the experimental std lib documentation.
74		stage3-debug/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib
	74	# TODO: move this to a build.zig flag (-Denable-tidy)
	75	tidy --drop-empty-elements no -qe "zig-out/doc/langref.html"
75	76
76	77	# Ensure that updating the wasm binary from this commit will result in a viable build.
77	78	stage3-debug/bin/zig build update-zig1
...	...	@@ -91,6 +92,7 @@ cmake .. \
91	92	-DZIG_TARGET_TRIPLE="$TARGET" \
92	93	-DZIG_TARGET_MCPU="$MCPU" \
93	94	-DZIG_STATIC=ON \
	95	-DZIG_NO_LIB=ON \
94	96	-GNinja
95	97
96	98	unset CC
...	...	@@ -102,6 +104,7 @@ stage3/bin/zig test ../test/behavior.zig -I../test
102	104	stage3/bin/zig build -p stage4 \
103	105	-Dstatic-llvm \
104	106	-Dtarget=native-native-musl \
	107	-Dno-lib \
105	108	--search-prefix "$PREFIX" \
106	109	--zig-lib-dir "$(pwd)/../lib"
107	110	stage4/bin/zig test ../test/behavior.zig -I../test

ci/aarch64-linux-release.sh+9-6

...	...	@@ -40,6 +40,7 @@ cmake .. \
40	40	-DZIG_TARGET_TRIPLE="$TARGET" \
41	41	-DZIG_TARGET_MCPU="$MCPU" \
42	42	-DZIG_STATIC=ON \
	43	-DZIG_NO_LIB=ON \
43	44	-GNinja
44	45
45	46	# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
...	...	@@ -49,16 +50,18 @@ unset CXX
49	50
50	51	ninja install
51	52
	53	# TODO: move this to a build.zig step (check-fmt)
52	54	echo "Looking for non-conforming code formatting..."
53	55	stage3-release/bin/zig fmt --check .. \
54	56	--exclude ../test/cases/ \
55	57	--exclude ../build-release
56	58
57	59	# simultaneously test building self-hosted without LLVM and with 32-bit arm
58		stage3-release/bin/zig build -Dtarget=arm-linux-musleabihf
	60	stage3-release/bin/zig build \
	61	-Dtarget=arm-linux-musleabihf \
	62	-Dno-lib
59	63
60	64	# TODO: add -fqemu back to this line
61
62	65	stage3-release/bin/zig build test docs \
63	66	--maxrss 24696061952 \
64	67	-fwasmtime \
...	...	@@ -68,10 +71,8 @@ stage3-release/bin/zig build test docs \
68	71	--zig-lib-dir "$(pwd)/../lib"
69	72
70	73	# Look for HTML errors.
71		tidy --drop-empty-elements no -qe "stage3-release/doc/langref.html"
72
73		# Produce the experimental std lib documentation.
74		stage3-release/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib
	74	# TODO: move this to a build.zig flag (-Denable-tidy)
	75	tidy --drop-empty-elements no -qe "zig-out/doc/langref.html"
75	76
76	77	# Ensure that updating the wasm binary from this commit will result in a viable build.
77	78	stage3-release/bin/zig build update-zig1
...	...	@@ -91,6 +92,7 @@ cmake .. \
91	92	-DZIG_TARGET_TRIPLE="$TARGET" \
92	93	-DZIG_TARGET_MCPU="$MCPU" \
93	94	-DZIG_STATIC=ON \
	95	-DZIG_NO_LIB=ON \
94	96	-GNinja
95	97
96	98	unset CC
...	...	@@ -102,6 +104,7 @@ stage3/bin/zig test ../test/behavior.zig -I../test
102	104	stage3/bin/zig build -p stage4 \
103	105	-Dstatic-llvm \
104	106	-Dtarget=native-native-musl \
	107	-Dno-lib \
105	108	--search-prefix "$PREFIX" \
106	109	--zig-lib-dir "$(pwd)/../lib"
107	110	stage4/bin/zig test ../test/behavior.zig -I../test

ci/aarch64-macos-debug.sh+1-3

...	...	@@ -39,6 +39,7 @@ PATH="$HOME/local/bin:$PATH" cmake .. \
39	39	-DZIG_TARGET_TRIPLE="$TARGET" \
40	40	-DZIG_TARGET_MCPU="$MCPU" \
41	41	-DZIG_STATIC=ON \
	42	-DZIG_NO_LIB=ON \
42	43	-GNinja
43	44
44	45	$HOME/local/bin/ninja install
...	...	@@ -49,6 +50,3 @@ stage3-debug/bin/zig build test docs \
49	50	-Dstatic-llvm \
50	51	-Dskip-non-native \
51	52	--search-prefix "$PREFIX"
52
53		# Produce the experimental std lib documentation.
54		stage3-debug/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib

ci/aarch64-macos-release.sh+1-3

...	...	@@ -39,6 +39,7 @@ PATH="$HOME/local/bin:$PATH" cmake .. \
39	39	-DZIG_TARGET_TRIPLE="$TARGET" \
40	40	-DZIG_TARGET_MCPU="$MCPU" \
41	41	-DZIG_STATIC=ON \
	42	-DZIG_NO_LIB=ON \
42	43	-GNinja
43	44
44	45	$HOME/local/bin/ninja install
...	...	@@ -50,9 +51,6 @@ stage3-release/bin/zig build test docs \
50	51	-Dskip-non-native \
51	52	--search-prefix "$PREFIX"
52	53
53		# Produce the experimental std lib documentation.
54		stage3-release/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib
55
56	54	# Ensure that stage3 and stage4 are byte-for-byte identical.
57	55	stage3-release/bin/zig build \
58	56	--prefix stage4-release \

ci/aarch64-windows.ps1+2-9

...	...	@@ -55,7 +55,8 @@ $Env:ZIG_LOCAL_CACHE_DIR="$(Get-Location)\zig-local-cache"
55	55	-DZIG_AR_WORKAROUND=ON `
56	56	-DZIG_TARGET_TRIPLE="$TARGET" `
57	57	-DZIG_TARGET_MCPU="$MCPU" `
58		-DZIG_STATIC=ON
	58	-DZIG_STATIC=ON `
	59	-DZIG_NO_LIB=ON
59	60	CheckLastExitCode
60	61
61	62	ninja install
...	...	@@ -69,11 +70,3 @@ Write-Output "Main test suite..."
69	70	-Dskip-non-native `
70	71	-Denable-symlinks-windows
71	72	CheckLastExitCode
72
73		Write-Output "Testing Autodocs..."
74		& "stage3-release\bin\zig.exe" test "..\lib\std\std.zig" `
75		--zig-lib-dir "$ZIG_LIB_DIR" `
76		-femit-docs `
77		-fno-emit-bin
78		CheckLastExitCode
79

ci/x86_64-linux-debug.sh+9-5

...	...	@@ -40,6 +40,7 @@ cmake .. \
40	40	-DZIG_TARGET_TRIPLE="$TARGET" \
41	41	-DZIG_TARGET_MCPU="$MCPU" \
42	42	-DZIG_STATIC=ON \
	43	-DZIG_NO_LIB=ON \
43	44	-GNinja
44	45
45	46	# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
...	...	@@ -49,13 +50,16 @@ unset CXX
49	50
50	51	ninja install
51	52
	53	# TODO: move this to a build.zig step (check-fmt)
52	54	echo "Looking for non-conforming code formatting..."
53	55	stage3-debug/bin/zig fmt --check .. \
54	56	--exclude ../test/cases/ \
55	57	--exclude ../build-debug
56	58
57	59	# simultaneously test building self-hosted without LLVM and with 32-bit arm
58		stage3-debug/bin/zig build -Dtarget=arm-linux-musleabihf
	60	stage3-debug/bin/zig build \
	61	-Dtarget=arm-linux-musleabihf \
	62	-Dno-lib
59	63
60	64	stage3-debug/bin/zig build test docs \
61	65	--maxrss 21000000000 \
...	...	@@ -67,10 +71,8 @@ stage3-debug/bin/zig build test docs \
67	71	--zig-lib-dir "$(pwd)/../lib"
68	72
69	73	# Look for HTML errors.
70		tidy --drop-empty-elements no -qe "stage3-debug/doc/langref.html"
71
72		# Produce the experimental std lib documentation.
73		stage3-debug/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib
	74	# TODO: move this to a build.zig flag (-Denable-tidy)
	75	tidy --drop-empty-elements no -qe "zig-out/doc/langref.html"
74	76
75	77	# Ensure that updating the wasm binary from this commit will result in a viable build.
76	78	stage3-debug/bin/zig build update-zig1
...	...	@@ -90,6 +92,7 @@ cmake .. \
90	92	-DZIG_TARGET_TRIPLE="$TARGET" \
91	93	-DZIG_TARGET_MCPU="$MCPU" \
92	94	-DZIG_STATIC=ON \
	95	-DZIG_NO_LIB=ON \
93	96	-GNinja
94	97
95	98	unset CC
...	...	@@ -101,6 +104,7 @@ stage3/bin/zig test ../test/behavior.zig -I../test
101	104	stage3/bin/zig build -p stage4 \
102	105	-Dstatic-llvm \
103	106	-Dtarget=native-native-musl \
	107	-Dno-lib \
104	108	--search-prefix "$PREFIX" \
105	109	--zig-lib-dir "$(pwd)/../lib"
106	110	stage4/bin/zig test ../test/behavior.zig -I../test

ci/x86_64-linux-release.sh+9-5

...	...	@@ -40,6 +40,7 @@ cmake .. \
40	40	-DZIG_TARGET_TRIPLE="$TARGET" \
41	41	-DZIG_TARGET_MCPU="$MCPU" \
42	42	-DZIG_STATIC=ON \
	43	-DZIG_NO_LIB=ON \
43	44	-GNinja
44	45
45	46	# Now cmake will use zig as the C/C++ compiler. We reset the environment variables
...	...	@@ -49,6 +50,7 @@ unset CXX
49	50
50	51	ninja install
51	52
	53	# TODO: move this to a build.zig step (check-fmt)
52	54	echo "Looking for non-conforming code formatting..."
53	55	stage3-release/bin/zig fmt --check .. \
54	56	--exclude ../test/cases/ \
...	...	@@ -56,7 +58,9 @@ stage3-release/bin/zig fmt --check .. \
56	58	--exclude ../build-release
57	59
58	60	# simultaneously test building self-hosted without LLVM and with 32-bit arm
59		stage3-release/bin/zig build -Dtarget=arm-linux-musleabihf
	61	stage3-release/bin/zig build \
	62	-Dtarget=arm-linux-musleabihf \
	63	-Dno-lib
60	64
61	65	stage3-release/bin/zig build test docs \
62	66	--maxrss 21000000000 \
...	...	@@ -68,10 +72,8 @@ stage3-release/bin/zig build test docs \
68	72	--zig-lib-dir "$(pwd)/../lib"
69	73
70	74	# Look for HTML errors.
71		tidy --drop-empty-elements no -qe "stage3-release/doc/langref.html"
72
73		# Produce the experimental std lib documentation.
74		stage3-release/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib
	75	# TODO: move this to a build.zig flag (-Denable-tidy)
	76	tidy --drop-empty-elements no -qe "zig-out/doc/langref.html"
75	77
76	78	# Ensure that stage3 and stage4 are byte-for-byte identical.
77	79	stage3-release/bin/zig build \
...	...	@@ -107,6 +109,7 @@ cmake .. \
107	109	-DZIG_TARGET_TRIPLE="$TARGET" \
108	110	-DZIG_TARGET_MCPU="$MCPU" \
109	111	-DZIG_STATIC=ON \
	112	-DZIG_NO_LIB=ON \
110	113	-GNinja
111	114
112	115	unset CC
...	...	@@ -118,6 +121,7 @@ stage3/bin/zig test ../test/behavior.zig -I../test
118	121	stage3/bin/zig build -p stage4 \
119	122	-Dstatic-llvm \
120	123	-Dtarget=native-native-musl \
	124	-Dno-lib \
121	125	--search-prefix "$PREFIX" \
122	126	--zig-lib-dir "$(pwd)/../lib"
123	127	stage4/bin/zig test ../test/behavior.zig -I../test

ci/x86_64-macos-release.sh+2-4

...	...	@@ -43,7 +43,8 @@ cmake .. \
43	43	-DCMAKE_CXX_COMPILER="$ZIG;c++;-target;$TARGET;-mcpu=$MCPU" \
44	44	-DZIG_TARGET_TRIPLE="$TARGET" \
45	45	-DZIG_TARGET_MCPU="$MCPU" \
46		-DZIG_STATIC=ON
	46	-DZIG_STATIC=ON \
	47	-DZIG_NO_LIB=ON
47	48
48	49	make $JOBS install
49	50
...	...	@@ -54,9 +55,6 @@ stage3/bin/zig build test docs \
54	55	-Dskip-non-native \
55	56	--search-prefix "$PREFIX"
56	57
57		# Produce the experimental std lib documentation.
58		stage3/bin/zig test ../lib/std/std.zig -femit-docs -fno-emit-bin --zig-lib-dir ../lib
59
60	58	# Ensure that stage3 and stage4 are byte-for-byte identical.
61	59	stage3/bin/zig build \
62	60	--prefix stage4 \

ci/x86_64-windows-debug.ps1+2-8

...	...	@@ -45,7 +45,8 @@ Set-Location -Path 'build-debug'
45	45	-DCMAKE_CXX_COMPILER="$($ZIG -Replace "\\", "/");c++;-target;$TARGET;-mcpu=$MCPU" `
46	46	-DZIG_TARGET_TRIPLE="$TARGET" `
47	47	-DZIG_TARGET_MCPU="$MCPU" `
48		-DZIG_STATIC=ON
	48	-DZIG_STATIC=ON `
	49	-DZIG_NO_LIB=ON
49	50	CheckLastExitCode
50	51
51	52	ninja install
...	...	@@ -60,13 +61,6 @@ Write-Output "Main test suite..."
60	61	-Denable-symlinks-windows
61	62	CheckLastExitCode
62	63
63		Write-Output "Testing Autodocs..."
64		& "stage3-debug\bin\zig.exe" test "..\lib\std\std.zig" `
65		--zig-lib-dir "$ZIG_LIB_DIR" `
66		-femit-docs `
67		-fno-emit-bin
68		CheckLastExitCode
69
70	64	Write-Output "Build x86_64-windows-msvc behavior tests using the C backend..."
71	65	& "stage3-debug\bin\zig.exe" test `
72	66	..\test\behavior.zig `

ci/x86_64-windows-release.ps1+2-8

...	...	@@ -45,7 +45,8 @@ Set-Location -Path 'build-release'
45	45	-DCMAKE_CXX_COMPILER="$($ZIG -Replace "\\", "/");c++;-target;$TARGET;-mcpu=$MCPU" `
46	46	-DZIG_TARGET_TRIPLE="$TARGET" `
47	47	-DZIG_TARGET_MCPU="$MCPU" `
48		-DZIG_STATIC=ON
	48	-DZIG_STATIC=ON `
	49	-DZIG_NO_LIB=ON
49	50	CheckLastExitCode
50	51
51	52	ninja install
...	...	@@ -60,13 +61,6 @@ Write-Output "Main test suite..."
60	61	-Denable-symlinks-windows
61	62	CheckLastExitCode
62	63
63		Write-Output "Testing Autodocs..."
64		& "stage3-release\bin\zig.exe" test "..\lib\std\std.zig" `
65		--zig-lib-dir "$ZIG_LIB_DIR" `
66		-femit-docs `
67		-fno-emit-bin
68		CheckLastExitCode
69
70	64	Write-Output "Build x86_64-windows-msvc behavior tests using the C backend..."
71	65	& "stage3-release\bin\zig.exe" test `
72	66	..\test\behavior.zig `

lib/std/Build/Step/Compile.zig+17-3

...	...	@@ -49,7 +49,6 @@ verbose_cc: bool,
49	49	emit_analysis: EmitOption = .default,
50	50	emit_asm: EmitOption = .default,
51	51	emit_bin: EmitOption = .default,
52		emit_docs: EmitOption = .default,
53	52	emit_implib: EmitOption = .default,
54	53	emit_llvm_bc: EmitOption = .default,
55	54	emit_llvm_ir: EmitOption = .default,
...	...	@@ -217,6 +216,7 @@ output_lib_path_source: GeneratedFile,
217	216	output_h_path_source: GeneratedFile,
218	217	output_pdb_path_source: GeneratedFile,
219	218	output_dirname_source: GeneratedFile,
	219	generated_docs: ?*GeneratedFile,
220	220
221	221	pub const CSourceFiles = struct {
222	222	files: []const []const u8,
...	...	@@ -433,7 +433,7 @@ pub fn create(owner: std.Build, options: Options) Compile {
433	433	}) catch @panic("OOM");
434	434
435	435	const self = owner.allocator.create(Compile) catch @panic("OOM");
436		self.* = Compile{
	436	self.* = .{
437	437	.strip = null,
438	438	.unwind_tables = null,
439	439	.verbose_link = false,
...	...	@@ -486,6 +486,7 @@ pub fn create(owner: std.Build, options: Options) Compile {
486	486	.output_h_path_source = GeneratedFile{ .step = &self.step },
487	487	.output_pdb_path_source = GeneratedFile{ .step = &self.step },
488	488	.output_dirname_source = GeneratedFile{ .step = &self.step },
	489	.generated_docs = null,
489	490
490	491	.target_info = target_info,
491	492
...	...	@@ -1004,6 +1005,15 @@ pub fn getOutputPdbSource(self: *Compile) FileSource {
1004	1005	return .{ .generated = &self.output_pdb_path_source };
1005	1006	}
1006	1007
	1008	pub fn getOutputDocs(self: *Compile) FileSource {
	1009	assert(self.generated_docs == null); // This function may only be called once.
	1010	const arena = self.step.owner.allocator;
	1011	const generated_file = arena.create(GeneratedFile) catch @panic("OOM");
	1012	generated_file.* = .{ .step = &self.step };
	1013	self.generated_docs = generated_file;
	1014	return .{ .generated = generated_file };
	1015	}
	1016
1007	1017	pub fn addAssemblyFile(self: *Compile, path: []const u8) void {
1008	1018	const b = self.step.owner;
1009	1019	self.link_objects.append(.{
...	...	@@ -1509,7 +1519,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
1509	1519	if (self.emit_analysis.getArg(b, "emit-analysis")) \|arg\| try zig_args.append(arg);
1510	1520	if (self.emit_asm.getArg(b, "emit-asm")) \|arg\| try zig_args.append(arg);
1511	1521	if (self.emit_bin.getArg(b, "emit-bin")) \|arg\| try zig_args.append(arg);
1512		if (self.emit_docs.getArg(b, "emit-docs")) \|arg\| try zig_args.append(arg);
	1522	if (self.generated_docs != null) try zig_args.append("-femit-docs");
1513	1523	if (self.emit_implib.getArg(b, "emit-implib")) \|arg\| try zig_args.append(arg);
1514	1524	if (self.emit_llvm_bc.getArg(b, "emit-llvm-bc")) \|arg\| try zig_args.append(arg);
1515	1525	if (self.emit_llvm_ir.getArg(b, "emit-llvm-ir")) \|arg\| try zig_args.append(arg);
...	...	@@ -2022,6 +2032,10 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
2022	2032	&.{ output_dir, self.out_pdb_filename },
2023	2033	);
2024	2034	}
	2035
	2036	if (self.generated_docs) \|generated_docs\| {
	2037	generated_docs.path = b.pathJoin(&.{ output_dir, "docs" });
	2038	}
2025	2039	}
2026	2040
2027	2041	if (self.kind == .lib and self.linkage != null and self.linkage.? == .dynamic and

src/Autodoc.zig+13-40

...	...	@@ -15,7 +15,6 @@ const log = std.log.scoped(.autodoc);
15	15	const renderer = @import("autodoc/render_source.zig");
16	16
17	17	comp_module: *CompilationModule,
18		doc_location: Compilation.EmitLoc,
19	18	arena: std.mem.Allocator,
20	19
21	20	// The goal of autodoc is to fill up these arrays
...	...	@@ -74,28 +73,23 @@ const Section = struct {
74	73	};
75	74	};
76	75
77		var arena_allocator: std.heap.ArenaAllocator = undefined;
78		pub fn init(m: *CompilationModule, doc_location: Compilation.EmitLoc) Autodoc {
79		arena_allocator = std.heap.ArenaAllocator.init(m.gpa);
80		return .{
81		.comp_module = m,
82		.doc_location = doc_location,
	76	pub fn generate(cm: *CompilationModule, output_dir: std.fs.Dir) !void {
	77	var arena_allocator = std.heap.ArenaAllocator.init(cm.gpa);
	78	defer arena_allocator.deinit();
	79	var autodoc: Autodoc = .{
	80	.comp_module = cm,
83	81	.arena = arena_allocator.allocator(),
84	82	};
85		}
	83	try autodoc.generateZirData(output_dir);
86	84
87		pub fn deinit(_: *Autodoc) void {
88		arena_allocator.deinit();
	85	const lib_dir = cm.comp.zig_lib_directory.handle;
	86	try lib_dir.copyFile("docs/main.js", output_dir, "main.js", .{});
	87	try lib_dir.copyFile("docs/ziglexer.js", output_dir, "ziglexer.js", .{});
	88	try lib_dir.copyFile("docs/commonmark.js", output_dir, "commonmark.js", .{});
	89	try lib_dir.copyFile("docs/index.html", output_dir, "index.html", .{});
89	90	}
90	91
91		/// The entry point of the Autodoc generation process.
92		pub fn generateZirData(self: *Autodoc) !void {
93		if (self.doc_location.directory) \|dir\| {
94		if (dir.path) \|path\| {
95		log.debug("path: {s}", .{path});
96		}
97		}
98
	92	fn generateZirData(self: *Autodoc, output_dir: std.fs.Dir) !void {
99	93	const root_src_dir = self.comp_module.main_pkg.root_src_directory;
100	94	const root_src_path = self.comp_module.main_pkg.root_src_path;
101	95	const joined_src_path = try root_src_dir.join(self.arena, &.{root_src_path});
...	...	@@ -362,19 +356,6 @@ pub fn generateZirData(self: *Autodoc) !void {
362	356	.guide_sections = self.guide_sections,
363	357	};
364	358
365		const base_dir = self.doc_location.directory orelse
366		self.comp_module.zig_cache_artifact_directory;
367
368		base_dir.handle.makeDir(self.doc_location.basename) catch \|e\| switch (e) {
369		error.PathAlreadyExists => {},
370		else => \|err\| return err,
371		};
372
373		const output_dir = if (self.doc_location.directory) \|d\|
374		try d.handle.openDir(self.doc_location.basename, .{})
375		else
376		try self.comp_module.zig_cache_artifact_directory.handle.openDir(self.doc_location.basename, .{});
377
378	359	{
379	360	const data_js_f = try output_dir.createFile("data.js", .{});
380	361	defer data_js_f.close();
...	...	@@ -386,7 +367,7 @@ pub fn generateZirData(self: *Autodoc) !void {
386	367	\\ var zigAnalysis=
387	368	, .{});
388	369	try std.json.stringifyArbitraryDepth(
389		arena_allocator.allocator(),
	370	self.arena,
390	371	data,
391	372	.{
392	373	.whitespace = .minified,
...	...	@@ -439,14 +420,6 @@ pub fn generateZirData(self: *Autodoc) !void {
439	420	try buffer.flush();
440	421	}
441	422	}
442
443		// copy main.js, index.html
444		var docs_dir = try self.comp_module.comp.zig_lib_directory.handle.openDir("docs", .{});
445		defer docs_dir.close();
446		try docs_dir.copyFile("main.js", output_dir, "main.js", .{});
447		try docs_dir.copyFile("ziglexer.js", output_dir, "ziglexer.js", .{});
448		try docs_dir.copyFile("commonmark.js", output_dir, "commonmark.js", .{});
449		try docs_dir.copyFile("index.html", output_dir, "index.html", .{});
450	423	}
451	424
452	425	/// Represents a chain of scopes, used to resolve decl references to the

src/Compilation.zig+66-20

...	...	@@ -118,6 +118,7 @@ self_exe_path: ?[]const u8,
118	118	whole_bin_sub_path: ?[]u8,
119	119	/// Same as `whole_bin_sub_path` but for implibs.
120	120	whole_implib_sub_path: ?[]u8,
	121	whole_docs_sub_path: ?[]u8,
121	122	zig_lib_directory: Directory,
122	123	local_cache_directory: Directory,
123	124	global_cache_directory: Directory,
...	...	@@ -179,7 +180,6 @@ emit_asm: ?EmitLoc,
179	180	emit_llvm_ir: ?EmitLoc,
180	181	emit_llvm_bc: ?EmitLoc,
181	182	emit_analysis: ?EmitLoc,
182		emit_docs: ?EmitLoc,
183	183
184	184	work_queue_wait_group: WaitGroup = .{},
185	185	astgen_wait_group: WaitGroup = .{},
...	...	@@ -1119,6 +1119,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1119	1119	cache.hash.addOptional(options.dwarf_format);
1120	1120	cache_helpers.addOptionalEmitLoc(&cache.hash, options.emit_bin);
1121	1121	cache_helpers.addOptionalEmitLoc(&cache.hash, options.emit_implib);
	1122	cache_helpers.addOptionalEmitLoc(&cache.hash, options.emit_docs);
1122	1123	cache.hash.addBytes(options.root_name);
1123	1124	if (options.target.os.tag == .wasi) cache.hash.add(wasi_exec_model);
1124	1125	// TODO audit this and make sure everything is in it
...	...	@@ -1171,8 +1172,8 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1171	1172	// For whole cache mode, it is still used for builtin.zig so that the file
1172	1173	// path to builtin.zig can remain consistent during a debugging session at
1173	1174	// runtime. However, we don't know where to put outputs from the linker
1174		// or stage1 backend object files until the final cache hash, which is available
1175		// after the compilation is complete.
	1175	// until the final cache hash, which is available after the
	1176	// compilation is complete.
1176	1177	//
1177	1178	// Therefore, in whole cache mode, we additionally create a temporary cache
1178	1179	// directory for these two kinds of build artifacts, and then rename it
...	...	@@ -1346,6 +1347,8 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1346	1347	};
1347	1348	}
1348	1349
	1350	// In case of whole cache mode, `whole_bin_sub_path` is used to distinguish
	1351	// between -femit-bin and -fno-emit-bin.
1349	1352	switch (cache_mode) {
1350	1353	.whole => break :blk null,
1351	1354	.incremental => {},
...	...	@@ -1408,6 +1411,34 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1408	1411	};
1409	1412	};
1410	1413
	1414	const docs_emit: ?link.Emit = blk: {
	1415	const emit_docs = options.emit_docs orelse break :blk null;
	1416
	1417	if (emit_docs.directory) \|directory\| {
	1418	break :blk .{
	1419	.directory = directory,
	1420	.sub_path = emit_docs.basename,
	1421	};
	1422	}
	1423
	1424	// This is here for the same reason as in `bin_file_emit` above.
	1425	switch (cache_mode) {
	1426	.whole => break :blk null,
	1427	.incremental => {},
	1428	}
	1429
	1430	// Use the same directory as the bin, if possible.
	1431	if (bin_file_emit) \|x\| break :blk .{
	1432	.directory = x.directory,
	1433	.sub_path = emit_docs.basename,
	1434	};
	1435
	1436	break :blk .{
	1437	.directory = module.?.zig_cache_artifact_directory,
	1438	.sub_path = emit_docs.basename,
	1439	};
	1440	};
	1441
1411	1442	// This is so that when doing `CacheMode.whole`, the mechanism in update()
1412	1443	// can use it for communicating the result directory via `bin_file.emit`.
1413	1444	// This is used to distinguish between -fno-emit-bin and -femit-bin
...	...	@@ -1417,6 +1448,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1417	1448	const whole_bin_sub_path: ?[]u8 = try prepareWholeEmitSubPath(arena, options.emit_bin);
1418	1449	// Same thing but for implibs.
1419	1450	const whole_implib_sub_path: ?[]u8 = try prepareWholeEmitSubPath(arena, options.emit_implib);
	1451	const whole_docs_sub_path: ?[]u8 = try prepareWholeEmitSubPath(arena, options.emit_docs);
1420	1452
1421	1453	var system_libs: std.StringArrayHashMapUnmanaged(SystemLib) = .{};
1422	1454	errdefer system_libs.deinit(gpa);
...	...	@@ -1428,6 +1460,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1428	1460	const bin_file = try link.File.openPath(gpa, .{
1429	1461	.emit = bin_file_emit,
1430	1462	.implib_emit = implib_emit,
	1463	.docs_emit = docs_emit,
1431	1464	.root_name = root_name,
1432	1465	.module = module,
1433	1466	.target = options.target,
...	...	@@ -1552,11 +1585,11 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
1552	1585	.bin_file = bin_file,
1553	1586	.whole_bin_sub_path = whole_bin_sub_path,
1554	1587	.whole_implib_sub_path = whole_implib_sub_path,
	1588	.whole_docs_sub_path = whole_docs_sub_path,
1555	1589	.emit_asm = options.emit_asm,
1556	1590	.emit_llvm_ir = options.emit_llvm_ir,
1557	1591	.emit_llvm_bc = options.emit_llvm_bc,
1558	1592	.emit_analysis = options.emit_analysis,
1559		.emit_docs = options.emit_docs,
1560	1593	.work_queue = std.fifo.LinearFifo(Job, .Dynamic).init(gpa),
1561	1594	.anon_work_queue = std.fifo.LinearFifo(Job, .Dynamic).init(gpa),
1562	1595	.c_object_work_queue = std.fifo.LinearFifo(*CObject, .Dynamic).init(gpa),
...	...	@@ -1940,7 +1973,7 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void
1940	1973	};
1941	1974	};
1942	1975
1943		// This updates the output directory for stage1 backend and linker outputs.
	1976	// This updates the output directory for linker outputs.
1944	1977	if (comp.bin_file.options.module) \|module\| {
1945	1978	module.zig_cache_artifact_directory = tmp_artifact_directory.?;
1946	1979	}
...	...	@@ -1960,6 +1993,12 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void
1960	1993	.sub_path = std.fs.path.basename(sub_path),
1961	1994	};
1962	1995	}
	1996	if (comp.whole_docs_sub_path) \|sub_path\| {
	1997	options.docs_emit = .{
	1998	.directory = tmp_artifact_directory.?,
	1999	.sub_path = std.fs.path.basename(sub_path),
	2000	};
	2001	}
1963	2002	var old_bin_file = comp.bin_file;
1964	2003	comp.bin_file = try link.File.openPath(comp.gpa, options);
1965	2004	old_bin_file.destroy();
...	...	@@ -2064,16 +2103,6 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void
2064	2103	return;
2065	2104	}
2066	2105
2067		if (!build_options.only_c and !build_options.only_core_functionality) {
2068		if (comp.emit_docs) \|doc_location\| {
2069		if (comp.bin_file.options.module) \|module\| {
2070		var autodoc = Autodoc.init(module, doc_location);
2071		defer autodoc.deinit();
2072		try autodoc.generateZirData();
2073		}
2074		}
2075		}
2076
2077	2106	// Flush takes care of -femit-bin, but we still have -femit-llvm-ir, -femit-llvm-bc, and
2078	2107	// -femit-asm to handle, in the case of C objects.
2079	2108	comp.emitOthers();
...	...	@@ -2122,12 +2151,21 @@ pub fn update(comp: Compilation, main_progress_node: std.Progress.Node) !void
2122	2151	};
2123	2152
2124	2153	try comp.flush(main_progress_node);
	2154	if (comp.totalErrorCount() != 0) return;
	2155
	2156	// TODO: do this in a separate job during performAllTheWork(). The
	2157	// file copies at the end of generate() can also be extracted to
	2158	// separate jobs
	2159	if (!build_options.only_c and !build_options.only_core_functionality) {
	2160	if (comp.bin_file.options.docs_emit) \|emit\| {
	2161	var dir = try emit.directory.handle.makeOpenPath(emit.sub_path, .{});
	2162	defer dir.close();
	2163	try Autodoc.generate(module, dir);
	2164	}
	2165	}
2125	2166	} else {
2126	2167	try comp.flush(main_progress_node);
2127		}
2128
2129		if (comp.totalErrorCount() != 0) {
2130		return;
	2168	if (comp.totalErrorCount() != 0) return;
2131	2169	}
2132	2170
2133	2171	// Failure here only means an unnecessary cache miss.
...	...	@@ -2190,6 +2228,15 @@ fn wholeCacheModeSetBinFilePath(comp: Compilation, digest: const [Cache.hex_di
2190	2228	.sub_path = sub_path,
2191	2229	};
2192	2230	}
	2231
	2232	if (comp.whole_docs_sub_path) \|sub_path\| {
	2233	@memcpy(sub_path[digest_start..][0..digest.len], digest);
	2234
	2235	comp.bin_file.options.docs_emit = .{
	2236	.directory = comp.local_cache_directory,
	2237	.sub_path = sub_path,
	2238	};
	2239	}
2193	2240	}
2194	2241
2195	2242	fn prepareWholeEmitSubPath(arena: Allocator, opt_emit: ?EmitLoc) error{OutOfMemory}!?[]u8 {
...	...	@@ -2265,7 +2312,6 @@ fn addNonIncrementalStuffToCacheManifest(comp: Compilation, man: Cache.Manifes
2265	2312	cache_helpers.addOptionalEmitLoc(&man.hash, comp.emit_llvm_ir);
2266	2313	cache_helpers.addOptionalEmitLoc(&man.hash, comp.emit_llvm_bc);
2267	2314	cache_helpers.addOptionalEmitLoc(&man.hash, comp.emit_analysis);
2268		cache_helpers.addOptionalEmitLoc(&man.hash, comp.emit_docs);
2269	2315
2270	2316	man.hash.addListOfBytes(comp.clang_argv);
2271	2317

src/link.zig+3-1

...	...	@@ -71,8 +71,10 @@ pub const Emit = struct {
71	71	pub const Options = struct {
72	72	/// This is `null` when `-fno-emit-bin` is used.
73	73	emit: ?Emit,
74		/// This is `null` not building a Windows DLL, or when `-fno-emit-implib` is used.
	74	/// This is `null` when not building a Windows DLL, or when `-fno-emit-implib` is used.
75	75	implib_emit: ?Emit,
	76	/// This is non-null when `-femit-docs` is provided.
	77	docs_emit: ?Emit,
76	78	target: std.Target,
77	79	output_mode: std.builtin.OutputMode,
78	80	link_mode: std.builtin.LinkMode,

src/main.zig+27-10

...	...	@@ -622,7 +622,7 @@ const Emit = union(enum) {
622	622	}
623	623	};
624	624
625		fn resolve(emit: Emit, default_basename: []const u8) !Resolved {
	625	fn resolve(emit: Emit, default_basename: []const u8, output_to_cache: bool) !Resolved {
626	626	var resolved: Resolved = .{ .data = null, .dir = null };
627	627	errdefer resolved.deinit();
628	628
...	...	@@ -630,7 +630,10 @@ const Emit = union(enum) {
630	630	.no => {},
631	631	.yes_default_path => {
632	632	resolved.data = Compilation.EmitLoc{
633		.directory = .{ .path = null, .handle = fs.cwd() },
	633	.directory = if (output_to_cache) null else .{
	634	.path = null,
	635	.handle = fs.cwd(),
	636	},
634	637	.basename = default_basename,
635	638	};
636	639	},
...	...	@@ -2750,7 +2753,7 @@ fn buildOutputType(
2750	2753	};
2751	2754
2752	2755	const default_h_basename = try std.fmt.allocPrint(arena, "{s}.h", .{root_name});
2753		var emit_h_resolved = emit_h.resolve(default_h_basename) catch \|err\| {
	2756	var emit_h_resolved = emit_h.resolve(default_h_basename, output_to_cache) catch \|err\| {
2754	2757	switch (emit_h) {
2755	2758	.yes => \|p\| {
2756	2759	fatal("unable to open directory from argument '-femit-h', '{s}': {s}", .{
...	...	@@ -2768,7 +2771,7 @@ fn buildOutputType(
2768	2771	defer emit_h_resolved.deinit();
2769	2772
2770	2773	const default_asm_basename = try std.fmt.allocPrint(arena, "{s}.s", .{root_name});
2771		var emit_asm_resolved = emit_asm.resolve(default_asm_basename) catch \|err\| {
	2774	var emit_asm_resolved = emit_asm.resolve(default_asm_basename, output_to_cache) catch \|err\| {
2772	2775	switch (emit_asm) {
2773	2776	.yes => \|p\| {
2774	2777	fatal("unable to open directory from argument '-femit-asm', '{s}': {s}", .{
...	...	@@ -2786,7 +2789,7 @@ fn buildOutputType(
2786	2789	defer emit_asm_resolved.deinit();
2787	2790
2788	2791	const default_llvm_ir_basename = try std.fmt.allocPrint(arena, "{s}.ll", .{root_name});
2789		var emit_llvm_ir_resolved = emit_llvm_ir.resolve(default_llvm_ir_basename) catch \|err\| {
	2792	var emit_llvm_ir_resolved = emit_llvm_ir.resolve(default_llvm_ir_basename, output_to_cache) catch \|err\| {
2790	2793	switch (emit_llvm_ir) {
2791	2794	.yes => \|p\| {
2792	2795	fatal("unable to open directory from argument '-femit-llvm-ir', '{s}': {s}", .{
...	...	@@ -2804,7 +2807,7 @@ fn buildOutputType(
2804	2807	defer emit_llvm_ir_resolved.deinit();
2805	2808
2806	2809	const default_llvm_bc_basename = try std.fmt.allocPrint(arena, "{s}.bc", .{root_name});
2807		var emit_llvm_bc_resolved = emit_llvm_bc.resolve(default_llvm_bc_basename) catch \|err\| {
	2810	var emit_llvm_bc_resolved = emit_llvm_bc.resolve(default_llvm_bc_basename, output_to_cache) catch \|err\| {
2808	2811	switch (emit_llvm_bc) {
2809	2812	.yes => \|p\| {
2810	2813	fatal("unable to open directory from argument '-femit-llvm-bc', '{s}': {s}", .{
...	...	@@ -2822,7 +2825,7 @@ fn buildOutputType(
2822	2825	defer emit_llvm_bc_resolved.deinit();
2823	2826
2824	2827	const default_analysis_basename = try std.fmt.allocPrint(arena, "{s}-analysis.json", .{root_name});
2825		var emit_analysis_resolved = emit_analysis.resolve(default_analysis_basename) catch \|err\| {
	2828	var emit_analysis_resolved = emit_analysis.resolve(default_analysis_basename, output_to_cache) catch \|err\| {
2826	2829	switch (emit_analysis) {
2827	2830	.yes => \|p\| {
2828	2831	fatal("unable to open directory from argument '-femit-analysis', '{s}': {s}", .{
...	...	@@ -2839,7 +2842,7 @@ fn buildOutputType(
2839	2842	};
2840	2843	defer emit_analysis_resolved.deinit();
2841	2844
2842		var emit_docs_resolved = emit_docs.resolve("docs") catch \|err\| {
	2845	var emit_docs_resolved = emit_docs.resolve("docs", output_to_cache) catch \|err\| {
2843	2846	switch (emit_docs) {
2844	2847	.yes => \|p\| {
2845	2848	fatal("unable to open directory from argument '-femit-docs', '{s}': {s}", .{
...	...	@@ -2873,7 +2876,7 @@ fn buildOutputType(
2873	2876	const default_implib_basename = try std.fmt.allocPrint(arena, "{s}.lib", .{root_name});
2874	2877	var emit_implib_resolved = switch (emit_implib) {
2875	2878	.no => Emit.Resolved{ .data = null, .dir = null },
2876		.yes => \|p\| emit_implib.resolve(default_implib_basename) catch \|err\| {
	2879	.yes => \|p\| emit_implib.resolve(default_implib_basename, output_to_cache) catch \|err\| {
2877	2880	fatal("unable to open directory from argument '-femit-implib', '{s}': {s}", .{
2878	2881	p, @errorName(err),
2879	2882	});
...	...	@@ -3566,7 +3569,21 @@ fn serveUpdateResults(s: Server, comp: Compilation) !void {
3566	3569	defer error_bundle.deinit(gpa);
3567	3570	if (error_bundle.errorMessageCount() > 0) {
3568	3571	try s.serveErrorBundle(error_bundle);
3569		} else if (comp.bin_file.options.emit) \|emit\| {
	3572	return;
	3573	}
	3574	// This logic is a bit counter-intuitive because the protocol implies that
	3575	// each emitted artifact could possibly be in a different location, when in
	3576	// reality, there is only one artifact output directory, and the build
	3577	// system depends on that fact. So, until the protocol is changed to
	3578	// reflect this, this logic only needs to ensure that emit_bin_path is
	3579	// emitted for at least one thing, if there are any artifacts.
	3580	if (comp.bin_file.options.emit) \|emit\| {
	3581	const full_path = try emit.directory.join(gpa, &.{emit.sub_path});
	3582	defer gpa.free(full_path);
	3583	try s.serveEmitBinPath(full_path, .{
	3584	.flags = .{ .cache_hit = comp.last_update_was_cache_hit },
	3585	});
	3586	} else if (comp.bin_file.options.docs_emit) \|emit\| {
3570	3587	const full_path = try emit.directory.join(gpa, &.{emit.sub_path});
3571	3588	defer gpa.free(full_path);
3572	3589	try s.serveEmitBinPath(full_path, .{