bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

compiler/rustc_session: fix sysroot detection logic ...

Browse source 
... on systems where /usr/lib contains a multi-arch structure
This commit is contained in:
liushuyu 2023-02-27 13:31:35 -07:00
parent 31f858d9a5
commit 2186358e5a
No known key found for this signature in database
GPG key ID: 23D1CE4534419437
1 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -182,7 +182,17 @@ pub fn get_or_default_sysroot() -> Result<PathBuf, String> {
if dir.ends_with(crate::config::host_triple()) { if dir.ends_with(crate::config::host_triple()) {
dir.parent() // chop off `$target` dir.parent() // chop off `$target`
.and_then(|p| p.parent()) // chop off `rustlib` .and_then(|p| p.parent()) // chop off `rustlib`
.and_then(|p| p.parent()) // chop off `lib` .and_then(|p| {
// chop off `lib` (this could be also $arch dir if the host sysroot uses a
// multi-arch layout like Debian or Ubuntu)
match p.parent() {
Some(p) => match p.file_name() {
Some(f) if f == "lib" => p.parent(), // first chop went for $arch, so chop again for `lib`
_ => Some(p),
},
None => None,
}
})
.map(|s| s.to_owned()) .map(|s| s.to_owned())
.ok_or(format!( .ok_or(format!(
"Could not move 3 levels upper using `parent()` on {}", "Could not move 3 levels upper using `parent()` on {}",