nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 17:24:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update src/bootstrap/config.rs

Browse Source 
Co-authored-by: Bruno Kolenbrander <59372212+mejrs@users.noreply.github.com>
This commit is contained in:
Tuna 2022-09-20 06:29:34 +03:00 committed by GitHub
parent 0bb4e25ec4
commit e248523d2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bootstrap/config.rs
View File

@ -821,7 +821,14 @@ impl Config {
.and_then(|output| if output.status.success() { Some(output) } else { None });
if let Some(output) = output {
let git_root = String::from_utf8(output.stdout).unwrap();
config.src = PathBuf::from(git_root.trim().to_owned())
let git_root = PathBuf::from(git_root.trim()).canonicalize().unwrap();
let s = git_root.to_str().unwrap();
// Bootstrap is quite bad at handling /? in front of paths
config.src = match s.strip_prefix("\\\\?\\") {
Some(p) => PathBuf::from(p),
None => PathBuf::from(git_root),
};
} else {
// We're building from a tarball, not git sources.
// We don't support pre-downloaded bootstrap in this case.