rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix cargo run tidy

Browse Source 
When I implemented rust-only bootstrapping in https://github.com/rust-lang/rust/pull/92260,
I neglected to test stage0 tools - it turns out they were broken because
they couldn't find the sysroot of the initial bootstrap compiler.

This fixes stage0 tools by using `rustc --print sysroot` instead of assuming rustc is already in a
sysroot and hard-coding the relative directory.
This commit is contained in:
Joshua Nelson
2022-03-10 08:47:53 -06:00
parent 687e53ebfe
commit 25a7d2d540
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/bootstrap/lib.rs
View File

@@ -117,6 +117,7 @@ use std::os::unix::fs::symlink as symlink_file;
use std::os::windows::fs::symlink_file; use std::os::windows::fs::symlink_file;
use filetime::FileTime; use filetime::FileTime;
use once_cell::sync::OnceCell;
use crate::builder::Kind; use crate::builder::Kind;
use crate::config::{LlvmLibunwind, TargetSelection}; use crate::config::{LlvmLibunwind, TargetSelection};
@@ -892,7 +893,12 @@ impl Build {
/// Returns the sysroot of the snapshot compiler. /// Returns the sysroot of the snapshot compiler.
fn rustc_snapshot_sysroot(&self) -> &Path { fn rustc_snapshot_sysroot(&self) -> &Path {
self.initial_rustc.parent().unwrap().parent().unwrap() static SYSROOT_CACHE: OnceCell<PathBuf> = once_cell::sync::OnceCell::new();
SYSROOT_CACHE.get_or_init(|| {
let mut rustc = Command::new(&self.initial_rustc);
rustc.args(&["--print", "sysroot"]);
output(&mut rustc).trim().into()
})
} }
/// Runs a command, printing out nice contextual information if it fails. /// Runs a command, printing out nice contextual information if it fails.