bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

visionOS: Fix logic for finding the SDK root

Browse source 
The `sdk_name` is `xros`/`xrsimulator`, not `visionos`/`visionossimulator`.
This commit is contained in:
Mads Marquart 2024-04-10 15:02:04 +02:00
parent b14d8b2ef2
commit efbbfa24a5
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
compiler/rustc_codegen_ssa/src/back/link.rs
View file

@ -3029,9 +3029,10 @@ fn get_apple_sdk_root(sdk_name: &str) -> Result<String, errors::AppleSdkRootErro
|| sdkroot.contains("MacOSX.platform") => {} || sdkroot.contains("MacOSX.platform") => {}
"watchsimulator" "watchsimulator"
if sdkroot.contains("WatchOS.platform") || sdkroot.contains("MacOSX.platform") => {} if sdkroot.contains("WatchOS.platform") || sdkroot.contains("MacOSX.platform") => {}
"visionos" "xros"
if sdkroot.contains("XROS.platform") || sdkroot.contains("MacOSX.platform") => {} if sdkroot.contains("XRSimulator.platform")
"visionossimulator" || sdkroot.contains("MacOSX.platform") => {}
"xrsimulator"
if sdkroot.contains("XROS.platform") || sdkroot.contains("MacOSX.platform") => {} if sdkroot.contains("XROS.platform") || sdkroot.contains("MacOSX.platform") => {}
// Ignore `SDKROOT` if it's not a valid path. // Ignore `SDKROOT` if it's not a valid path.
_ if !p.is_absolute() || p == Path::new("/") || !p.exists() => {} _ if !p.is_absolute() || p == Path::new("/") || !p.exists() => {}