Removed testing crate references, and removed updated object-rs depen…

…dency
rust-lang · Feb 24, 2024 · f56c6b5 · f56c6b5
1 parent ce2df6b
commit f56c6b5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -118,8 +118,6 @@ strip = true
 rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
 rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
 rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
-libc = { path = '../libc' }
-object = { path = '../object' }
 
 [patch."https://github.com/rust-lang/rust-clippy"]
 clippy_lints = { path = "src/tools/clippy/clippy_lints" }
diff --git a/compiler/rustc_target/src/spec/base/apple/mod.rs b/compiler/rustc_target/src/spec/base/apple/mod.rs
@@ -203,7 +203,8 @@ pub fn sdk_version(platform: u32) -> Option<(u32, u32)> {
         | object::macho::PLATFORM_TVOSSIMULATOR
         | object::macho::PLATFORM_MACCATALYST => Some((16, 2)),
         object::macho::PLATFORM_WATCHOS | object::macho::PLATFORM_WATCHOSSIMULATOR => Some((9, 1)),
-        object::macho::PLATFORM_XROS | object::macho::PLATFORM_XROSSIMULATOR => Some((1, 0)),
+        // TODO: Upgrade to yet unreleased `object-rs` implementation with xrOS platform definition
+        11 | 12 => Some((1, 0)),
         _ => None,
     }
 }
@@ -218,8 +219,9 @@ pub fn platform(target: &Target) -> Option<u32> {
         ("watchos", _) => object::macho::PLATFORM_WATCHOS,
         ("tvos", "sim") => object::macho::PLATFORM_TVOSSIMULATOR,
         ("tvos", _) => object::macho::PLATFORM_TVOS,
-        ("xros", "sim") => object::macho::PLATFORM_XROSSIMULATOR,
-        ("xros", _) => object::macho::PLATFORM_XROS,
+        // TODO: Upgrade to yet unreleased `object-rs` implementation with xrOS platform definition
+        ("xros", "sim") => 12,
+        ("xros", _) => 11,
         _ => return None,
     })
 }