Commit 7c718fc72e23130b3093ccec7d644ee94017f3d6 | zig

author	Andrew Kelley <andrew@ziglang.org> 2026-04-19 10:56:24-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2026-05-25 18:54:34-07:00
log	7c718fc72e23130b3093ccec7d644ee94017f3d6
tree	2d6d3be29489ca6f0ba66fb60a851b2e8e194c28
parent	088f815031dd3570c9cc179e193cbd545e5bb3a3

6 files changed, 7 insertions(+), 44 deletions(-)

BRANCH_TODO+2-28

...	...	@@ -13,6 +13,8 @@
13	13	* refactor with DefaultingEnum
14	14	* inspect b4ffb402c082605c4b324e88120306fc8fb3cf32 diff and apply changes as needed (merge conflict)
15	15	* https://codeberg.org/ziglang/zig/issues/31397
	16	* restore the generated_compiler_rt_dyn_lib hack?
	17	* run args
16	18
17	19	## Followup Issues
18	20	* link_eh_frame_hdr should be DefaultingBool
...	...	@@ -21,31 +23,3 @@
21	23	- but artifact install steps also add paths for dyn libs on windows
22	24
23	25
24
25		## Unresolved Branch Conflicts
26
27		* move max_jobs to maker not configurer
28
29		+// hack for stage2_x86_64 + coff
30		+generated_compiler_rt_dyn_lib: ?*GeneratedFile,
31
32		+ // hack for stage2_x86_64 + coff
33		+ if (compile.generated_compiler_rt_dyn_lib) \|lp\| lp.path = compile.outputPath(output_dir, .compiler_rt_dyn_lib);
34
35		if (install_artifact.compiler_rt_dyn_lib_dir) \|compiler_rt_dir\| {
36		const full_compiler_rt_path = b.getInstallPath(compiler_rt_dir, install_artifact.emitted_compiler_rt_dyn_lib.?.basename(b, step));
37		const p = try step.installFile(install_artifact.emitted_compiler_rt_dyn_lib.?, full_compiler_rt_path);
38		all_cached = all_cached and p == .fresh;
39		}
40
41
42		.compiler_rt_dyn_lib_dir = switch (options.compiler_rt_dyn_lib_dir) {
43		.disabled => null,
44		.default => if (artifact.producesCompilerRtDynLib()) dest_dir else null,
45		.override => \|o\| o,
46		},
47
48		if (install_artifact.compiler_rt_dyn_lib_dir != null) install_artifact.emitted_compiler_rt_dyn_lib = artifact.getEmittedCompilerRtDynLib();
49
50
51

lib/compiler/Maker/Graph.zig+3

...	...	@@ -48,6 +48,9 @@ sysroot: ?[]const u8 = null,
48	48	search_prefixes: std.ArrayList([]const u8) = .empty,
49	49	build_id: ?std.zig.BuildId = null,
50	50	error_limit: ?u32 = null,
	51	/// Steps should use `io` to limit the number of jobs, however in the case of
	52	/// a single step spawning a fixed number of processes this can be used.
	53	max_jobs: ?u32 = null,
51	54
52	55	/// Intention of verbose is to print all sub-process command lines to stderr
53	56	/// before spawning them.

lib/compiler/configurer.zig+1-1

...	...	@@ -952,7 +952,7 @@ fn serialize(b: std.Build, wc: Configuration.Wip, writer: *Io.Writer) !void {
952	952	.expect_term => \|t\| expect_term = switch (t) {
953	953	.exited => \|x\| .{ .status = .exited, .value = x },
954	954	.signal => \|x\| .{ .status = .signal, .value = @intFromEnum(x) },
955		.stopped => \|x\| .{ .status = .stopped, .value = x },
	955	.stopped => \|x\| .{ .status = .stopped, .value = @intFromEnum(x) },
956	956	.unknown => \|x\| .{ .status = .unknown, .value = x },
957	957	},
958	958	},

lib/std/Build.zig-10

...	...	@@ -32,13 +32,6 @@ allocator: Allocator,
32	32	user_input_options: UserInputOptionsMap,
33	33	available_options_map: AvailableOptionsMap,
34	34	available_options_list: std.array_list.Managed(AvailableOption),
35		verbose: bool,
36		verbose_link: bool,
37		verbose_cc: bool,
38		verbose_air: bool,
39		verbose_llvm_ir: ?[]const u8,
40		verbose_llvm_bc: ?[]const u8,
41		verbose_llvm_cpu_features: bool,
42	35	invalid_user_input: bool,
43	36	default_step: *Step,
44	37	top_level_steps: std.StringArrayHashMapUnmanaged(*Step.TopLevel),
...	...	@@ -100,9 +93,6 @@ pub const Graph = struct {
100	93	host: ResolvedTarget,
101	94	dependency_cache: InitializedDepMap = .empty,
102	95	allow_so_scripts: ?bool = null,
103		/// Steps should use `io` to limit the number of jobs, however in the case of
104		/// a single step spawning a fixed number of processes this can be used.
105		max_jobs: ?u32 = null,
106	96	time_report: bool = false,
107	97	/// Similar to the `Io.Terminal.Mode` returned by `Io.lockStderr`, but also
108	98	/// respects the '--color' flag.

lib/std/Build/Cache.zig+1-1

...	...	@@ -195,7 +195,7 @@ pub const HashHelper = struct {
195	195	}
196	196
197	197	pub fn addBytesZ(hh: *HashHelper, bytes: [:0]const u8) void {
198		hh.hasher.update(mem.absorbSentinel(u8, 0, bytes));
	198	hh.hasher.update(mem.absorbSentinel(bytes));
199	199	}
200	200
201	201	pub fn addOptionalBytes(hh: *HashHelper, optional_bytes: ?[]const u8) void {

lib/std/Build/Step/InstallArtifact.zig-4

...	...	@@ -17,10 +17,6 @@ emitted_implib: ?LazyPath,
17	17	pdb_dir: ?InstallDir,
18	18	emitted_pdb: ?LazyPath,
19	19
20		// hack for stage2_x86_64 + coff
21		compiler_rt_dyn_lib_dir: ?InstallDir,
22		emitted_compiler_rt_dyn_lib: ?LazyPath,
23
24	20	h_dir: ?InstallDir,
25	21	emitted_h: ?LazyPath,
26	22