mirror of
https://github.com/ziglang/zig.git
synced 2025-12-06 14:23:09 +00:00
Compilation: fix buildGlibcSharedObjects error handling
Oops, this was supposed to be only a temporary troubleshooting patch.
This commit is contained in:
parent
34409635ad
commit
426d65d700
@ -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 {
|
fn buildGlibcSharedObjects(comp: *Compilation, prog_node: std.Progress.Node) void {
|
||||||
defer comp.link_task_queue.finishPrelinkItem(comp);
|
defer comp.link_task_queue.finishPrelinkItem(comp);
|
||||||
glibc.buildSharedObjects(comp, prog_node) catch unreachable;
|
if (glibc.buildSharedObjects(comp, prog_node)) |_| {
|
||||||
//if (glibc.buildSharedObjects(comp, prog_node)) |_| {
|
// The job should no longer be queued up since it succeeded.
|
||||||
// // The job should no longer be queued up since it succeeded.
|
comp.queued_jobs.glibc_shared_objects = false;
|
||||||
// comp.queued_jobs.glibc_shared_objects = false;
|
} else |err| switch (err) {
|
||||||
//} else |err| switch (err) {
|
error.AlreadyReported => return,
|
||||||
// error.AlreadyReported => return,
|
else => comp.lockAndSetMiscFailure(.glibc_shared_objects, "unable to build glibc shared objects: {t}", .{err}),
|
||||||
// else => comp.lockAndSetMiscFailure(.glibc_shared_objects, "unable to build glibc shared objects: {s}", .{
|
}
|
||||||
// @errorName(err),
|
|
||||||
// }),
|
|
||||||
//}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn buildFreeBSDCrtFile(comp: *Compilation, crt_file: freebsd.CrtFile, prog_node: std.Progress.Node) void {
|
fn buildFreeBSDCrtFile(comp: *Compilation, crt_file: freebsd.CrtFile, prog_node: std.Progress.Node) void {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user