diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2025-09-06 19:31:26 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2025-09-06 19:32:27 -0700 |
| commit | 426d65d700012b27ffa652258554032f171ad77d (patch) | |
| tree | cab484ad2424a1223eb36f2464d5656e8df53455 /src/Compilation.zig | |
| parent | 34409635ad3a5aa199adde1cabbeadb1ac6e256c (diff) | |
| download | zig-426d65d700012b27ffa652258554032f171ad77d.tar.gz zig-426d65d700012b27ffa652258554032f171ad77d.zip | |
Compilation: fix buildGlibcSharedObjects error handling
Oops, this was supposed to be only a temporary troubleshooting patch.
Diffstat (limited to 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 85c4f49bf6..868af7c253 100644 --- a/src/Compilation.zig +++ b/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 { |