mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #130138 - Zalathar:initial-libdir, r=albertlarsan68

Browse source 
bootstrap: Print more debug info when `find_initial_libdir` fails

From looking at the failure messages printed by #129775, my hypothesis is that `rustc --print=sysroot` sometimes prints the wrong path when the rustc executable is hardlinked in multiple places, at least on my macOS system.

However, currently I don't have any concrete evidence of this actually happening. This PR therefore expands on #129775 by printing even more information on failure (including the actual rustc path), in the hope that when the failure next occurs we can confirm or reject the hypothesis that `rustc --print=sysroot` is printing the wrong path.
This commit is contained in:
Stuart Cook 2024-09-14 11:53:11 +10:00 • committed by GitHub
commit 2bf0dd2735
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/bootstrap/src/lib.rs
View file

@ -347,10 +347,14 @@ impl Build {
}; };
let Some(initial_libdir) = find_initial_libdir() else { let Some(initial_libdir) = find_initial_libdir() else {
panic!( panic!(
"couldn't determine `initial_libdir` \ "couldn't determine `initial_libdir`:
from target dir {initial_target_dir:?} \ - config.initial_rustc: {rustc:?}
and sysroot {initial_sysroot:?}" - initial_target_libdir_str: {initial_target_libdir_str:?}
) - initial_target_dir: {initial_target_dir:?}
- initial_sysroot: {initial_sysroot:?}
",
rustc = config.initial_rustc,
);
}; };
let version = std::fs::read_to_string(src.join("src").join("version")) let version = std::fs::read_to_string(src.join("src").join("version"))