mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compilation: fix buildGlibcSharedObjects error handling

Browse Source 
Oops, this was supposed to be only a temporary troubleshooting patch.
This commit is contained in:
Andrew Kelley 2025-09-06 19:31:26 -07:00
parent 34409635ad
commit 426d65d700
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Compilation.zig
View File

@ -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 {