nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-16 17:03:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ld platform_version argument on Mac Catalyst

Browse Source
This commit is contained in:
Mads Marquart 2024-02-19 13:10:07 +01:00
parent 92d4b313eb
commit 3cb4e34310
1 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
compiler/rustc_target/src/spec/base/apple/mod.rs
View File

@ -97,14 +97,18 @@ fn pre_link_args(os: &'static str, arch: Arch, abi: &'static str) -> LinkArgs {
_ => os.into(), _ => os.into(),
}; };
let platform_version: StaticCow<str> = match os { let min_version: StaticCow<str> = {
"ios" => ios_lld_platform_version(arch), let (major, minor) = match (os, abi) {
"tvos" => tvos_lld_platform_version(), ("ios", "macabi") => mac_catalyst_deployment_target(),
"watchos" => watchos_lld_platform_version(), ("ios", _) => ios_deployment_target(arch),
"macos" => macos_lld_platform_version(arch), ("tvos", _) => tvos_deployment_target(),
_ => unreachable!(), ("watchos", _) => watchos_deployment_target(),
} ("macos", _) => macos_deployment_target(arch),
.into(); _ => unreachable!(),
};
format!("{major}.{minor}").into()
};
let sdk_version = min_version.clone();
let mut args = TargetOptions::link_args( let mut args = TargetOptions::link_args(
LinkerFlavor::Darwin(Cc::No, Lld::No), LinkerFlavor::Darwin(Cc::No, Lld::No),
@ -113,7 +117,7 @@ fn pre_link_args(os: &'static str, arch: Arch, abi: &'static str) -> LinkArgs {
add_link_args_iter( add_link_args_iter(
&mut args, &mut args,
LinkerFlavor::Darwin(Cc::No, Lld::No), LinkerFlavor::Darwin(Cc::No, Lld::No),
[platform_name, platform_version.clone(), platform_version].into_iter(), [platform_name, min_version, sdk_version].into_iter(),
); );
if abi != "macabi" { if abi != "macabi" {
add_link_args( add_link_args(
@ -268,11 +272,6 @@ fn macos_deployment_target(arch: Arch) -> (u32, u32) {
.unwrap_or_else(|| macos_default_deployment_target(arch)) .unwrap_or_else(|| macos_default_deployment_target(arch))
} }
fn macos_lld_platform_version(arch: Arch) -> String {
let (major, minor) = macos_deployment_target(arch);
format!("{major}.{minor}")
}
pub fn macos_llvm_target(arch: Arch) -> String { pub fn macos_llvm_target(arch: Arch) -> String {
let (major, minor) = macos_deployment_target(arch); let (major, minor) = macos_deployment_target(arch);
format!("{}-apple-macosx{}.{}.0", arch.target_name(), major, minor) format!("{}-apple-macosx{}.{}.0", arch.target_name(), major, minor)
@ -339,11 +338,6 @@ pub fn mac_catalyst_llvm_target(arch: Arch) -> String {
format!("{}-apple-ios{}.{}.0-macabi", arch.target_name(), major, minor) format!("{}-apple-ios{}.{}.0-macabi", arch.target_name(), major, minor)
} }
fn ios_lld_platform_version(arch: Arch) -> String {
let (major, minor) = ios_deployment_target(arch);
format!("{major}.{minor}")
}
pub fn ios_sim_llvm_target(arch: Arch) -> String { pub fn ios_sim_llvm_target(arch: Arch) -> String {
let (major, minor) = ios_deployment_target(arch); let (major, minor) = ios_deployment_target(arch);
format!("{}-apple-ios{}.{}.0-simulator", arch.target_name(), major, minor) format!("{}-apple-ios{}.{}.0-simulator", arch.target_name(), major, minor)
@ -354,11 +348,6 @@ fn tvos_deployment_target() -> (u32, u32) {
from_set_deployment_target("TVOS_DEPLOYMENT_TARGET").unwrap_or((10, 0)) from_set_deployment_target("TVOS_DEPLOYMENT_TARGET").unwrap_or((10, 0))
} }
fn tvos_lld_platform_version() -> String {
let (major, minor) = tvos_deployment_target();
format!("{major}.{minor}")
}
pub fn tvos_llvm_target(arch: Arch) -> String { pub fn tvos_llvm_target(arch: Arch) -> String {
let (major, minor) = tvos_deployment_target(); let (major, minor) = tvos_deployment_target();
format!("{}-apple-tvos{}.{}.0", arch.target_name(), major, minor) format!("{}-apple-tvos{}.{}.0", arch.target_name(), major, minor)
@ -374,11 +363,6 @@ fn watchos_deployment_target() -> (u32, u32) {
from_set_deployment_target("WATCHOS_DEPLOYMENT_TARGET").unwrap_or((5, 0)) from_set_deployment_target("WATCHOS_DEPLOYMENT_TARGET").unwrap_or((5, 0))
} }
fn watchos_lld_platform_version() -> String {
let (major, minor) = watchos_deployment_target();
format!("{major}.{minor}")
}
pub fn watchos_sim_llvm_target(arch: Arch) -> String { pub fn watchos_sim_llvm_target(arch: Arch) -> String {
let (major, minor) = watchos_deployment_target(); let (major, minor) = watchos_deployment_target();
format!("{}-apple-watchos{}.{}.0-simulator", arch.target_name(), major, minor) format!("{}-apple-watchos{}.{}.0-simulator", arch.target_name(), major, minor)