mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Normalize bootstrap_out path, r=clubby789

Browse Source
This commit is contained in:
Petr Sumbera 2024-04-29 08:58:59 +02:00
parent d3555f3d8e
commit feeb1842cb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bootstrap/src/lib.rs
View File

@ -370,11 +370,16 @@ pub fn new(mut config: Config) -> Build {
.expect("failed to read src/version");
let version = version.trim();
let bootstrap_out = std::env::current_exe()
let mut bootstrap_out = std::env::current_exe()
.expect("could not determine path to running process")
.parent()
.unwrap()
.to_path_buf();
// Since bootstrap is hardlink to deps/bootstrap-*, Solaris can sometimes give
// path with deps/ which is bad and needs to be avoided.
if bootstrap_out.ends_with("deps") {
bootstrap_out.pop();
}
if !bootstrap_out.join(exe("rustc", config.build)).exists() && !cfg!(test) {
// this restriction can be lifted whenever https://github.com/rust-lang/rfcs/pull/3028 is implemented
panic!(