authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-08-29 12:02:58+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2023-08-29 12:02:58+02:00
log1b01715a73b4156b3cb761d77d09c30791b8027c
tree32ec090f6ef15cb1a8150ad1ef0604007cdcd210
parent3ece3f83f3457544d58dad5f56dd7ba338f07d9a

link: remove unused darwin_sdk_version field

3 files changed, 8 insertions(+), 9 deletions(-)

src/link.zig-1
......@@ -228,7 +228,6 @@ pub const Options = struct {
228228
229229 version: ?std.SemanticVersion,
230230 compatibility_version: ?std.SemanticVersion,
231 darwin_sdk_version: ?std.SemanticVersion = null,
232231 libc_installation: ?*const LibCInstallation,
233232
234233 dwarf_format: ?std.dwarf.Format,
src/link/MachO.zig+4-4
......@@ -587,10 +587,10 @@ pub fn flushModule(self: *MachO, comp: *Compilation, prog_node: *std.Progress.No
587587 });
588588 {
589589 const platform = load_commands.Platform.fromOptions(&self.base.options);
590 const sdk_version: ?std.SemanticVersion = self.base.options.darwin_sdk_version orelse blk: {
591 if (self.base.options.sysroot) |path| break :blk load_commands.inferSdkVersionFromSdkPath(path);
592 break :blk null;
593 };
590 const sdk_version: ?std.SemanticVersion = if (self.base.options.sysroot) |path|
591 load_commands.inferSdkVersionFromSdkPath(path)
592 else
593 null;
594594 if (platform.isBuildVersionCompatible()) {
595595 try load_commands.writeBuildVersionLC(platform, sdk_version, lc_writer);
596596 } else {
src/link/MachO/zld.zig+4-4
......@@ -591,10 +591,10 @@ pub fn linkWithZld(
591591 });
592592 {
593593 const platform = load_commands.Platform.fromOptions(&macho_file.base.options);
594 const sdk_version: ?std.SemanticVersion = macho_file.base.options.darwin_sdk_version orelse blk: {
595 if (macho_file.base.options.sysroot) |path| break :blk load_commands.inferSdkVersionFromSdkPath(path);
596 break :blk null;
597 };
594 const sdk_version: ?std.SemanticVersion = if (macho_file.base.options.sysroot) |path|
595 load_commands.inferSdkVersionFromSdkPath(path)
596 else
597 null;
598598 if (platform.isBuildVersionCompatible()) {
599599 try load_commands.writeBuildVersionLC(platform, sdk_version, lc_writer);
600600 } else {