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

Rollup merge of #85326 - infinity0:fix-cross-compile-tools, r=Mark-Simulacrum

Browse source 
bootstrap: ensure host std when cross-compiling tools, fixes #85320
This commit is contained in:
Guillaume Gomez 2021-05-20 17:56:51 +02:00 committed by GitHub
parent 0d3bee8be0 9719031dd9
commit ddc376c03d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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"),