Skip to content

Commit 4402f2b

Browse files
Merge #9357
9357: fix: Update sysroot crates r=jonas-schievink a=jonas-schievink Removes `rtstartup`, since that's not a Cargo crate (its files are compiled into object files and linked alongside the stdlib). Adds `std_detect`. Part of #9352 (doesn't fix it since std_detect is full of `cfg_if!`) bors r+ Co-authored-by: Jonas Schievink <[email protected]>
2 parents c69f762 + 9e30690 commit 4402f2b

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

crates/project_model/src/sysroot.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,9 @@ impl Sysroot {
6868
pub fn load(sysroot_src_dir: &AbsPath) -> Result<Sysroot> {
6969
let mut sysroot = Sysroot { crates: Arena::default() };
7070

71-
for name in SYSROOT_CRATES.trim().lines() {
72-
let root = [format!("{}/src/lib.rs", name), format!("lib{}/lib.rs", name)]
71+
for path in SYSROOT_CRATES.trim().lines() {
72+
let name = path.split('/').last().unwrap();
73+
let root = [format!("{}/src/lib.rs", path), format!("lib{}/lib.rs", path)]
7374
.iter()
7475
.map(|it| sysroot_src_dir.join(it))
7576
.find(|it| it.exists());
@@ -191,9 +192,8 @@ panic_abort
191192
panic_unwind
192193
proc_macro
193194
profiler_builtins
194-
rtstartup
195195
std
196-
stdarch
196+
stdarch/crates/std_detect
197197
term
198198
test
199199
unwind";
@@ -204,9 +204,8 @@ core
204204
panic_abort
205205
panic_unwind
206206
profiler_builtins
207-
rtstartup
208207
proc_macro
209-
stdarch
208+
std_detect
210209
term
211210
test
212211
unwind";

0 commit comments

Comments
 (0)