Skip to content

Commit 7deea6b

Browse files
committed
resolve stage0 sysroot from rustc
Instead of manually navigating directories based on stage0 rustc, use `--print sysroot` to get the sysroot directly. This also works when using the bootstrap `rustc` shim. Signed-off-by: onur-ozkan <work@onurozkan.dev>
1 parent 2a4e930 commit 7deea6b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/bootstrap/src/core/config/config.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1833,7 +1833,9 @@ impl Config {
18331833
.join(exe("rustc", config.build))
18341834
};
18351835

1836-
config.initial_sysroot = config.initial_rustc.ancestors().nth(2).unwrap().into();
1836+
config.initial_sysroot = t!(PathBuf::from_str(
1837+
output(Command::new(&config.initial_rustc).args(["--print", "sysroot"])).trim()
1838+
));
18371839

18381840
config.initial_cargo_clippy = cargo_clippy;
18391841

0 commit comments

Comments
 (0)