Skip to content

Commit cba0a05

Browse files
committed
Removed testing crate references, and removed updated object-rs dependency
1 parent 67e7d4a commit cba0a05

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Cargo.toml

-2
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,6 @@ strip = true
118118
rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
119119
rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
120120
rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
121-
libc = { path = '../libc' }
122-
object = { path = '../object' }
123121

124122
[patch."https://github.com/rust-lang/rust-clippy"]
125123
clippy_lints = { path = "src/tools/clippy/clippy_lints" }

compiler/rustc_target/src/spec/base/apple/mod.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,8 @@ pub fn sdk_version(platform: u32) -> Option<(u32, u32)> {
203203
| object::macho::PLATFORM_TVOSSIMULATOR
204204
| object::macho::PLATFORM_MACCATALYST => Some((16, 2)),
205205
object::macho::PLATFORM_WATCHOS | object::macho::PLATFORM_WATCHOSSIMULATOR => Some((9, 1)),
206-
object::macho::PLATFORM_XROS | object::macho::PLATFORM_XROSSIMULATOR => Some((1, 0)),
206+
// TODO: Upgrade to yet unreleased `object-rs` implementation with xrOS platform definition
207+
11 | 12 => Some((1, 0)),
207208
_ => None,
208209
}
209210
}
@@ -218,8 +219,9 @@ pub fn platform(target: &Target) -> Option<u32> {
218219
("watchos", _) => object::macho::PLATFORM_WATCHOS,
219220
("tvos", "sim") => object::macho::PLATFORM_TVOSSIMULATOR,
220221
("tvos", _) => object::macho::PLATFORM_TVOS,
221-
("xros", "sim") => object::macho::PLATFORM_XROSSIMULATOR,
222-
("xros", _) => object::macho::PLATFORM_XROS,
222+
// TODO: Upgrade to yet unreleased `object-rs` implementation with xrOS platform definition
223+
("xros", "sim") => 12,
224+
("xros", _) => 11,
223225
_ => return None,
224226
})
225227
}

0 commit comments

Comments
 (0)