skip compile::Std
and compile::Rustc
on forced_compiler
Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
parent
cdd8af2299
commit
028aaa12b6
1 changed files with 11 additions and 3 deletions
|
@ -121,10 +121,18 @@ impl Step for ToolBuild {
|
||||||
|
|
||||||
match self.mode {
|
match self.mode {
|
||||||
Mode::ToolRustc => {
|
Mode::ToolRustc => {
|
||||||
builder.ensure(compile::Std::new(self.compiler, self.compiler.host));
|
// If compiler was forced, its artifacts should be prepared earlier.
|
||||||
builder.ensure(compile::Rustc::new(self.compiler, target));
|
if !self.compiler.is_forced_compiler() {
|
||||||
|
builder.ensure(compile::Std::new(self.compiler, self.compiler.host));
|
||||||
|
builder.ensure(compile::Rustc::new(self.compiler, target));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Mode::ToolStd => {
|
||||||
|
// If compiler was forced, its artifacts should be prepared earlier.
|
||||||
|
if !self.compiler.is_forced_compiler() {
|
||||||
|
builder.ensure(compile::Std::new(self.compiler, target))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Mode::ToolStd => builder.ensure(compile::Std::new(self.compiler, target)),
|
|
||||||
Mode::ToolBootstrap => {} // uses downloaded stage0 compiler libs
|
Mode::ToolBootstrap => {} // uses downloaded stage0 compiler libs
|
||||||
_ => panic!("unexpected Mode for tool build"),
|
_ => panic!("unexpected Mode for tool build"),
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue