squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

bootstrap: ensure host std when cross-compiling tools, fixes #85320

Browse source
This commit is contained in:
Ximin Luo 2021-05-15 15:05:06 +01:00
parent 75da570d78
commit 9719031dd9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/bootstrap/tool.rs
View file

@ -52,7 +52,10 @@ impl Step for ToolBuild {
let is_optional_tool = self.is_optional_tool;
match self.mode {
Mode::ToolRustc => builder.ensure(compile::Rustc { compiler, target }),
Mode::ToolRustc => {
builder.ensure(compile::Std { compiler, target: compiler.host });
builder.ensure(compile::Rustc { compiler, target });
}
Mode::ToolStd => builder.ensure(compile::Std { compiler, target }),
Mode::ToolBootstrap => {} // uses downloaded stage0 compiler libs
_ => panic!("unexpected Mode for tool build"),