diff --git a/src/link.zig b/src/link.zig index 724c1500f4..bf27efcc3a 100644 --- a/src/link.zig +++ b/src/link.zig @@ -228,7 +228,6 @@ pub const Options = struct { version: ?std.SemanticVersion, compatibility_version: ?std.SemanticVersion, - darwin_sdk_version: ?std.SemanticVersion = null, libc_installation: ?*const LibCInstallation, dwarf_format: ?std.dwarf.Format, diff --git a/src/link/MachO.zig b/src/link/MachO.zig index 5bde4575c5..f06466b41f 100644 --- a/src/link/MachO.zig +++ b/src/link/MachO.zig @@ -587,10 +587,10 @@ pub fn flushModule(self: *MachO, comp: *Compilation, prog_node: *std.Progress.No }); { const platform = load_commands.Platform.fromOptions(&self.base.options); - const sdk_version: ?std.SemanticVersion = self.base.options.darwin_sdk_version orelse blk: { - if (self.base.options.sysroot) |path| break :blk load_commands.inferSdkVersionFromSdkPath(path); - break :blk null; - }; + const sdk_version: ?std.SemanticVersion = if (self.base.options.sysroot) |path| + load_commands.inferSdkVersionFromSdkPath(path) + else + null; if (platform.isBuildVersionCompatible()) { try load_commands.writeBuildVersionLC(platform, sdk_version, lc_writer); } else { diff --git a/src/link/MachO/zld.zig b/src/link/MachO/zld.zig index 1a850b58a0..7c1b870ed5 100644 --- a/src/link/MachO/zld.zig +++ b/src/link/MachO/zld.zig @@ -591,10 +591,10 @@ pub fn linkWithZld( }); { const platform = load_commands.Platform.fromOptions(&macho_file.base.options); - const sdk_version: ?std.SemanticVersion = macho_file.base.options.darwin_sdk_version orelse blk: { - if (macho_file.base.options.sysroot) |path| break :blk load_commands.inferSdkVersionFromSdkPath(path); - break :blk null; - }; + const sdk_version: ?std.SemanticVersion = if (macho_file.base.options.sysroot) |path| + load_commands.inferSdkVersionFromSdkPath(path) + else + null; if (platform.isBuildVersionCompatible()) { try load_commands.writeBuildVersionLC(platform, sdk_version, lc_writer); } else {