diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2024-04-16 15:19:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-16 15:19:13 +0200 |
| commit | 1c8bdb93d986740dda310da9ae2327fecad505e2 (patch) | |
| tree | 59ddb12e56a191ba1037eeb50cd55dc1b2e86fdf /compiler/rustc_codegen_ssa/src | |
| parent | 9a7adb8d81026f49230aff1b332cb58a00712b03 (diff) | |
| parent | 1a7238407c8964fb902f259d712eac9e87052680 (diff) | |
| download | rust-1c8bdb93d986740dda310da9ae2327fecad505e2.tar.gz rust-1c8bdb93d986740dda310da9ae2327fecad505e2.zip | |
Rollup merge of #123721 - madsmtm:fix-visionos, r=davidtwco
Various visionOS fixes A few small mistakes was introduced in https://github.com/rust-lang/rust/pull/121419, probably after the rename from `xros` to `visionos`. See the commits for details. CC `@agg23` Since you reviewed https://github.com/rust-lang/rust/pull/121419 r? davidtwco
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 8ca18fbad99..b458f325b73 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -3038,9 +3038,10 @@ fn get_apple_sdk_root(sdk_name: &str) -> Result<String, errors::AppleSdkRootErro || sdkroot.contains("MacOSX.platform") => {} "watchsimulator" if sdkroot.contains("WatchOS.platform") || sdkroot.contains("MacOSX.platform") => {} - "visionos" - if sdkroot.contains("XROS.platform") || sdkroot.contains("MacOSX.platform") => {} - "visionossimulator" + "xros" + if sdkroot.contains("XRSimulator.platform") + || sdkroot.contains("MacOSX.platform") => {} + "xrsimulator" if sdkroot.contains("XROS.platform") || sdkroot.contains("MacOSX.platform") => {} // Ignore `SDKROOT` if it's not a valid path. _ if !p.is_absolute() || p == Path::new("/") || !p.exists() => {} |