bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fixed VISIONOS_DEPLOYMENT_TARGET envar test

Browse source
This commit is contained in:
Adam Gastineau 2024-03-19 06:44:35 -07:00
parent 51777dc812
commit f32ad2baf4
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_target/src/spec/base/apple/mod.rs
View file

@ -307,7 +307,7 @@ fn link_env_remove(os: &'static str) -> StaticCow<[StaticCow<str>]> {
// although this is apparently ignored when using the linker at "/usr/bin/ld". // although this is apparently ignored when using the linker at "/usr/bin/ld".
env_remove.push("IPHONEOS_DEPLOYMENT_TARGET".into()); env_remove.push("IPHONEOS_DEPLOYMENT_TARGET".into());
env_remove.push("TVOS_DEPLOYMENT_TARGET".into()); env_remove.push("TVOS_DEPLOYMENT_TARGET".into());
env_remove.push("visionos_DEPLOYMENT_TARGET".into()); env_remove.push("VISIONOS_DEPLOYMENT_TARGET".into());
env_remove.into() env_remove.into()
} else { } else {
// Otherwise if cross-compiling for a different OS/SDK (including Mac Catalyst), remove any part // Otherwise if cross-compiling for a different OS/SDK (including Mac Catalyst), remove any part
@ -375,7 +375,7 @@ pub fn watchos_sim_llvm_target(arch: Arch) -> String {
fn visionos_deployment_target() -> (u32, u32) { fn visionos_deployment_target() -> (u32, u32) {
// If you are looking for the default deployment target, prefer `rustc --print deployment-target`. // If you are looking for the default deployment target, prefer `rustc --print deployment-target`.
from_set_deployment_target("XROS_DEPLOYMENT_TARGET").unwrap_or((1, 0)) from_set_deployment_target("VISIONOS_DEPLOYMENT_TARGET").unwrap_or((1, 0))
} }
pub fn visionos_llvm_target(arch: Arch) -> String { pub fn visionos_llvm_target(arch: Arch) -> String {

2
compiler/rustc_target/src/spec/base/apple/tests.rs
View file

@ -34,7 +34,7 @@ fn macos_link_environment_unmodified() {
// for the host. // for the host.
assert_eq!( assert_eq!(
target.link_env_remove, target.link_env_remove,
crate::spec::cvs!["IPHONEOS_DEPLOYMENT_TARGET", "TVOS_DEPLOYMENT_TARGET"], crate::spec::cvs!["IPHONEOS_DEPLOYMENT_TARGET", "TVOS_DEPLOYMENT_TARGET", "VISIONOS_DEPLOYMENT_TARGET"],
); );
} }
} }