We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
2 parents 378a43a + feeb184 commit 9ba3d31Copy full SHA for 9ba3d31
src/bootstrap/src/lib.rs
@@ -376,11 +376,16 @@ impl Build {
376
.expect("failed to read src/version");
377
let version = version.trim();
378
379
- let bootstrap_out = std::env::current_exe()
+ let mut bootstrap_out = std::env::current_exe()
380
.expect("could not determine path to running process")
381
.parent()
382
.unwrap()
383
.to_path_buf();
384
+ // Since bootstrap is hardlink to deps/bootstrap-*, Solaris can sometimes give
385
+ // path with deps/ which is bad and needs to be avoided.
386
+ if bootstrap_out.ends_with("deps") {
387
+ bootstrap_out.pop();
388
+ }
389
if !bootstrap_out.join(exe("rustc", config.build)).exists() && !cfg!(test) {
390
// this restriction can be lifted whenever https://github.com/rust-lang/rfcs/pull/3028 is implemented
391
panic!(
0 commit comments