mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 12:59:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

link: remove unused darwin_sdk_version field

Browse Source
This commit is contained in:
Jakub Konka 2023-08-29 12:02:58 +02:00
parent 3ece3f83f3
commit 1b01715a73
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/link.zig
View File

@ -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,

8
src/link/MachO.zig
View File

@ -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 {

8
src/link/MachO/zld.zig
View File

@ -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 {