bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move get_tools_search_paths from FileSearch to Session

Browse source 
It only uses fields of FileSearch that are stored in Session too
This commit is contained in:
bjorn3 2021-08-31 18:36:25 +02:00
parent a4a22f07d7
commit 58000ed0e9
4 changed files with 17 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_session/src/filesearch.rs
View file

@ -87,18 +87,6 @@ impl<'a> FileSearch<'a> {
pub fn search_path_dirs(&self) -> Vec<PathBuf> {
self.search_paths().map(|sp| sp.dir.to_path_buf()).collect()
}
/// Returns a list of directories where target-specific tool binaries are located.
pub fn get_tools_search_paths(&self, self_contained: bool) -> Vec<PathBuf> {
let rustlib_path = rustc_target::target_rustlib_path(self.sysroot, &self.triple);
let p = std::array::IntoIter::new([
Path::new(&self.sysroot),
Path::new(&rustlib_path),
Path::new("bin"),
])
.collect::<PathBuf>();
if self_contained { vec![p.clone(), p.join("self-contained")] } else { vec![p] }
}
}
pub fn make_target_lib_path(sysroot: &Path, target_triple: &str) -> PathBuf {