authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-09-06 19:31:26-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-09-06 19:32:27-07:00
log426d65d700012b27ffa652258554032f171ad77d
treecab484ad2424a1223eb36f2464d5656e8df53455
parent34409635ad3a5aa199adde1cabbeadb1ac6e256c

Compilation: fix buildGlibcSharedObjects error handling

Oops, this was supposed to be only a temporary troubleshooting patch.

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

src/Compilation.zig+7-10
......@@ -5893,16 +5893,13 @@ fn buildGlibcCrtFile(comp: *Compilation, crt_file: glibc.CrtFile, prog_node: std
58935893
58945894fn buildGlibcSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) void {
58955895 defer comp.link_task_queue.finishPrelinkItem(comp);
5896 glibc.buildSharedObjects(comp, prog_node) catch unreachable;
5897 //if (glibc.buildSharedObjects(comp, prog_node)) |_| {
5898 // // The job should no longer be queued up since it succeeded.
5899 // comp.queued_jobs.glibc_shared_objects = false;
5900 //} else |err| switch (err) {
5901 // error.AlreadyReported => return,
5902 // else => comp.lockAndSetMiscFailure(.glibc_shared_objects, "unable to build glibc shared objects: {s}", .{
5903 // @errorName(err),
5904 // }),
5905 //}
5896 if (glibc.buildSharedObjects(comp, prog_node)) |_| {
5897 // The job should no longer be queued up since it succeeded.
5898 comp.queued_jobs.glibc_shared_objects = false;
5899 } else |err| switch (err) {
5900 error.AlreadyReported => return,
5901 else => comp.lockAndSetMiscFailure(.glibc_shared_objects, "unable to build glibc shared objects: {t}", .{err}),
5902 }
59065903}
59075904
59085905fn buildFreeBSDCrtFile(comp: *Compilation, crt_file: freebsd.CrtFile, prog_node: std.Progress.Node) void {