Skip to content

Commit

Permalink
Rollup merge of rust-lang#130479 - onur-ozkan:llvm-bitcode-linker-mul…
Browse files Browse the repository at this point in the history
…tiple-candidates, r=Kobzol

skip in-tree compiler build for llvm-bitcode-linker if ci-rustc is on

Similar to rust-lang#108767, resolves the `multiple candidates` problem for ci-rustc.

See rust-lang#122709 (comment) for more context.

Blocker for rust-lang#122709.
  • Loading branch information
workingjubilee authored Oct 7, 2024
2 parents bd2e7ee + c592eac commit 8cd9d95
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/bootstrap/src/core/build_steps/tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -872,8 +872,11 @@ impl Step for LlvmBitcodeLinker {
fn run(self, builder: &Builder<'_>) -> PathBuf {
let bin_name = "llvm-bitcode-linker";

builder.ensure(compile::Std::new(self.compiler, self.compiler.host));
builder.ensure(compile::Rustc::new(self.compiler, self.target));
// If enabled, use ci-rustc and skip building the in-tree compiler.
if !builder.download_rustc() {
builder.ensure(compile::Std::new(self.compiler, self.compiler.host));
builder.ensure(compile::Rustc::new(self.compiler, self.target));
}

let cargo = prepare_tool_cargo(
builder,
Expand Down

0 comments on commit 8cd9d95

Please sign in to comment.