Commit 426d65d700

Andrew Kelley <andrew@ziglang.org>
2025-09-07 04:31:26
Compilation: fix buildGlibcSharedObjects error handling
Oops, this was supposed to be only a temporary troubleshooting patch.
1 parent 3440963
Changed files (1)
src/Compilation.zig
@@ -5893,16 +5893,13 @@ fn buildGlibcCrtFile(comp: *Compilation, crt_file: glibc.CrtFile, prog_node: std
 
 fn buildGlibcSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) void {
     defer comp.link_task_queue.finishPrelinkItem(comp);
-    glibc.buildSharedObjects(comp, prog_node) catch unreachable;
-    //if (glibc.buildSharedObjects(comp, prog_node)) |_| {
-    //    // The job should no longer be queued up since it succeeded.
-    //    comp.queued_jobs.glibc_shared_objects = false;
-    //} else |err| switch (err) {
-    //    error.AlreadyReported => return,
-    //    else => comp.lockAndSetMiscFailure(.glibc_shared_objects, "unable to build glibc shared objects: {s}", .{
-    //        @errorName(err),
-    //    }),
-    //}
+    if (glibc.buildSharedObjects(comp, prog_node)) |_| {
+        // The job should no longer be queued up since it succeeded.
+        comp.queued_jobs.glibc_shared_objects = false;
+    } else |err| switch (err) {
+        error.AlreadyReported => return,
+        else => comp.lockAndSetMiscFailure(.glibc_shared_objects, "unable to build glibc shared objects: {t}", .{err}),
+    }
 }
 
 fn buildFreeBSDCrtFile(comp: *Compilation, crt_file: freebsd.CrtFile, prog_node: std.Progress.Node) void {