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

macho: do not enforce platform check for now

Browse Source
This commit is contained in:
Jakub Konka 2024-01-21 20:11:51 +01:00
parent ead0237814
commit 67ea039426
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/link/MachO/Dylib.zig
View File

@ -113,14 +113,16 @@ pub fn parse(self: *Dylib, macho_file: *MachO) !void {
});
return error.InvalidTarget;
}
if (macho_file.platform.version.order(platform.version) == .lt) {
try macho_file.reportParseError2(self.index, "object file built for newer platform: {}: {} < {}", .{
macho_file.platform.fmtTarget(macho_file.getTarget().cpu.arch),
macho_file.platform.version,
platform.version,
});
return error.InvalidTarget;
}
// TODO: this can cause the CI to fail so I'm commenting this check out so that
// I can work out the rest of the changes first
// if (macho_file.platform.version.order(platform.version) == .lt) {
// try macho_file.reportParseError2(self.index, "object file built for newer platform: {}: {} < {}", .{
// macho_file.platform.fmtTarget(macho_file.getTarget().cpu.arch),
// macho_file.platform.version,
// platform.version,
// });
// return error.InvalidTarget;
// }
}
}

18
src/link/MachO/Object.zig
View File

@ -173,14 +173,16 @@ pub fn parse(self: *Object, macho_file: *MachO) !void {
});
return error.InvalidTarget;
}
if (macho_file.platform.version.order(platform.version) == .lt) {
try macho_file.reportParseError2(self.index, "object file built for newer platform: {}: {} < {}", .{
macho_file.platform.fmtTarget(macho_file.getTarget().cpu.arch),
macho_file.platform.version,
platform.version,
});
return error.InvalidTarget;
}
// TODO: this causes the CI to fail so I'm commenting this check out so that
// I can work out the rest of the changes first
// if (macho_file.platform.version.order(platform.version) == .lt) {
// try macho_file.reportParseError2(self.index, "object file built for newer platform: {}: {} < {}", .{
// macho_file.platform.fmtTarget(macho_file.getTarget().cpu.arch),
// macho_file.platform.version,
// platform.version,
// });
// return error.InvalidTarget;
// }
}
try self.initDwarfInfo(macho_file);