Skip to content

Commit 2246812

Browse files
committed
use an explicit error set to fix a compilation error
this function has conditionally compiled out code in it about looking for native glibc.
1 parent 6fcf671 commit 2246812

File tree

1 file changed

+18
-1
lines changed

1 file changed

+18
-1
lines changed

lib/std/zig/system.zig

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,13 +481,30 @@ pub const NativeTargetInfo = struct {
481481
};
482482
}
483483

484+
pub const AbiAndDynamicLinkerFromFileError = error{
485+
FileSystem,
486+
SystemResources,
487+
SymLinkLoop,
488+
ProcessFdQuotaExceeded,
489+
SystemFdQuotaExceeded,
490+
UnableToReadElfFile,
491+
InvalidElfClass,
492+
InvalidElfVersion,
493+
InvalidElfEndian,
494+
InvalidElfFile,
495+
InvalidElfMagic,
496+
Unexpected,
497+
UnexpectedEndOfFile,
498+
NameTooLong,
499+
};
500+
484501
pub fn abiAndDynamicLinkerFromFile(
485502
file: fs.File,
486503
cpu: Target.Cpu,
487504
os: Target.Os,
488505
ld_info_list: []const LdInfo,
489506
cross_target: CrossTarget,
490-
) !NativeTargetInfo {
507+
) AbiAndDynamicLinkerFromFileError!NativeTargetInfo {
491508
var hdr_buf: [@sizeOf(elf.Elf64_Ehdr)]u8 align(@alignOf(elf.Elf64_Ehdr)) = undefined;
492509
_ = try preadFull(file, &hdr_buf, 0, hdr_buf.len);
493510
const hdr32 = @ptrCast(*elf.Elf32_Ehdr, &hdr_buf);

0 commit comments

Comments
 (0)