authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-04-19 10:56:24-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-05-25 18:54:34-07:00
log7c718fc72e23130b3093ccec7d644ee94017f3d6
tree2d6d3be29489ca6f0ba66fb60a851b2e8e194c28
parent088f815031dd3570c9cc179e193cbd545e5bb3a3

fix compilation errors from rebase conflicts

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

BRANCH_TODO+2-28
...@@ -13,6 +13,8 @@...@@ -13,6 +13,8 @@
13* refactor with DefaultingEnum13* refactor with DefaultingEnum
14* inspect b4ffb402c082605c4b324e88120306fc8fb3cf32 diff and apply changes as needed (merge conflict)14* inspect b4ffb402c082605c4b324e88120306fc8fb3cf32 diff and apply changes as needed (merge conflict)
15* https://codeberg.org/ziglang/zig/issues/3139715* https://codeberg.org/ziglang/zig/issues/31397
16* restore the generated_compiler_rt_dyn_lib hack?
17* run args
1618
17## Followup Issues19## Followup Issues
18* link_eh_frame_hdr should be DefaultingBool20* link_eh_frame_hdr should be DefaultingBool
...@@ -21,31 +23,3 @@...@@ -21,31 +23,3 @@
21 - but artifact install steps also add paths for dyn libs on windows23 - but artifact install steps also add paths for dyn libs on windows
2224
2325
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,6 +48,9 @@ sysroot: ?[]const u8 = null,
48search_prefixes: std.ArrayList([]const u8) = .empty,48search_prefixes: std.ArrayList([]const u8) = .empty,
49build_id: ?std.zig.BuildId = null,49build_id: ?std.zig.BuildId = null,
50error_limit: ?u32 = null,50error_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.
53max_jobs: ?u32 = null,
5154
52/// Intention of verbose is to print all sub-process command lines to stderr55/// Intention of verbose is to print all sub-process command lines to stderr
53/// before spawning them.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,7 +952,7 @@ fn serialize(b: *std.Build, wc: *Configuration.Wip, writer: *Io.Writer) !void {
952 .expect_term => |t| expect_term = switch (t) {952 .expect_term => |t| expect_term = switch (t) {
953 .exited => |x| .{ .status = .exited, .value = x },953 .exited => |x| .{ .status = .exited, .value = x },
954 .signal => |x| .{ .status = .signal, .value = @intFromEnum(x) },954 .signal => |x| .{ .status = .signal, .value = @intFromEnum(x) },
955 .stopped => |x| .{ .status = .stopped, .value = x },955 .stopped => |x| .{ .status = .stopped, .value = @intFromEnum(x) },
956 .unknown => |x| .{ .status = .unknown, .value = x },956 .unknown => |x| .{ .status = .unknown, .value = x },
957 },957 },
958 },958 },
lib/std/Build.zig-10
...@@ -32,13 +32,6 @@ allocator: Allocator,...@@ -32,13 +32,6 @@ allocator: Allocator,
32user_input_options: UserInputOptionsMap,32user_input_options: UserInputOptionsMap,
33available_options_map: AvailableOptionsMap,33available_options_map: AvailableOptionsMap,
34available_options_list: std.array_list.Managed(AvailableOption),34available_options_list: std.array_list.Managed(AvailableOption),
35verbose: bool,
36verbose_link: bool,
37verbose_cc: bool,
38verbose_air: bool,
39verbose_llvm_ir: ?[]const u8,
40verbose_llvm_bc: ?[]const u8,
41verbose_llvm_cpu_features: bool,
42invalid_user_input: bool,35invalid_user_input: bool,
43default_step: *Step,36default_step: *Step,
44top_level_steps: std.StringArrayHashMapUnmanaged(*Step.TopLevel),37top_level_steps: std.StringArrayHashMapUnmanaged(*Step.TopLevel),
...@@ -100,9 +93,6 @@ pub const Graph = struct {...@@ -100,9 +93,6 @@ pub const Graph = struct {
100 host: ResolvedTarget,93 host: ResolvedTarget,
101 dependency_cache: InitializedDepMap = .empty,94 dependency_cache: InitializedDepMap = .empty,
102 allow_so_scripts: ?bool = null,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 time_report: bool = false,96 time_report: bool = false,
107 /// Similar to the `Io.Terminal.Mode` returned by `Io.lockStderr`, but also97 /// Similar to the `Io.Terminal.Mode` returned by `Io.lockStderr`, but also
108 /// respects the '--color' flag.98 /// respects the '--color' flag.
lib/std/Build/Cache.zig+1-1
...@@ -195,7 +195,7 @@ pub const HashHelper = struct {...@@ -195,7 +195,7 @@ pub const HashHelper = struct {
195 }195 }
196196
197 pub fn addBytesZ(hh: *HashHelper, bytes: [:0]const u8) void {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 }
200200
201 pub fn addOptionalBytes(hh: *HashHelper, optional_bytes: ?[]const u8) void {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,10 +17,6 @@ emitted_implib: ?LazyPath,
17pdb_dir: ?InstallDir,17pdb_dir: ?InstallDir,
18emitted_pdb: ?LazyPath,18emitted_pdb: ?LazyPath,
1919
20// hack for stage2_x86_64 + coff
21compiler_rt_dyn_lib_dir: ?InstallDir,
22emitted_compiler_rt_dyn_lib: ?LazyPath,
23
24h_dir: ?InstallDir,20h_dir: ?InstallDir,
25emitted_h: ?LazyPath,21emitted_h: ?LazyPath,
2622