Rust bootstrap sysroot now has src in the same place as rust-src#1300
Rust bootstrap sysroot now has src in the same place as rust-src#1300bors merged 1 commit intorust-lang:masterfrom
Conversation
…remove special hack
| }; | ||
| base_dir.join("src") // Xargo wants the src-subdir | ||
| // Check for `$SYSROOT/lib/rustlib/src/rust/src`; test if that contains `libstd/lib.rs`. | ||
| let rustup_src = sysroot.join("lib").join("rustlib").join("src").join("rust").join("src"); |
There was a problem hiding this comment.
Hmm I should note something: $sysroot/lib/rustlib/src/rust corresponds to the "root" of rust-lang/rust, that's why it has a further src in it. It's annoying that it repeats but I think it would be to work with if $sysroot/lib/rustlib/src/rust was the directory being referred to and src/libstd/lib.rs a path within that directory.
Sadly it seems like XARGO_RUST_SRC includes the src directory component of rust-lang/rust, so this entire comment is unactionable 😞.
There was a problem hiding this comment.
Yeah it would be nicer to treat rustlib/src/rust as the root but as you said, that's not what xargo did, and now it's too late to change it (and not worth trying anyway).
|
@bors r+ |
|
📌 Commit bd9ec74 has been approved by |
|
☀️ Test successful - checks-travis, status-appveyor |
3 participants
So we can remove a special hack. I checked this locally to confirm it works.
Cc rust-lang/rust#70642 @eddyb