Skip to content

Commit

Permalink
Always use beta cargo (crater hack)
Browse files Browse the repository at this point in the history
  • Loading branch information
WaffleLapkin committed Apr 4, 2024
1 parent 9cd668c commit b288d58
Showing 1 changed file with 2 additions and 17 deletions.
19 changes: 2 additions & 17 deletions src/bootstrap/src/core/build_steps/tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -534,25 +534,10 @@ impl Step for Cargo {
)
}

fn make_run(run: RunConfig<'_>) {
run.builder.ensure(Cargo {
compiler: run.builder.compiler(run.builder.top_stage, run.builder.config.build),
target: run.target,
});
}
fn make_run(_run: RunConfig<'_>) {}

fn run(self, builder: &Builder<'_>) -> PathBuf {
let cargo_bin_path = builder.ensure(ToolBuild {
compiler: self.compiler,
target: self.target,
tool: "cargo",
mode: Mode::ToolRustc,
path: "src/tools/cargo",
source_type: SourceType::Submodule,
extra_features: Vec::new(),
allow_features: "",
});
cargo_bin_path
builder.initial_cargo.clone()
}
}

Expand Down

0 comments on commit b288d58

Please sign in to comment.