Skip to content

Commit b288d58

Browse files
committed
Always use beta cargo (crater hack)
1 parent 9cd668c commit b288d58

File tree

1 file changed

+2
-17
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+2
-17
lines changed

src/bootstrap/src/core/build_steps/tool.rs

+2-17
Original file line numberDiff line numberDiff line change
@@ -534,25 +534,10 @@ impl Step for Cargo {
534534
)
535535
}
536536

537-
fn make_run(run: RunConfig<'_>) {
538-
run.builder.ensure(Cargo {
539-
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
540-
target: run.target,
541-
});
542-
}
537+
fn make_run(_run: RunConfig<'_>) {}
543538

544539
fn run(self, builder: &Builder<'_>) -> PathBuf {
545-
let cargo_bin_path = builder.ensure(ToolBuild {
546-
compiler: self.compiler,
547-
target: self.target,
548-
tool: "cargo",
549-
mode: Mode::ToolRustc,
550-
path: "src/tools/cargo",
551-
source_type: SourceType::Submodule,
552-
extra_features: Vec::new(),
553-
allow_features: "",
554-
});
555-
cargo_bin_path
540+
builder.initial_cargo.clone()
556541
}
557542
}
558543

0 commit comments

Comments
 (0)