Skip to content

Commit 8cd9d95

Browse files
Rollup merge of rust-lang#130479 - onur-ozkan:llvm-bitcode-linker-multiple-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.
2 parents bd2e7ee + c592eac commit 8cd9d95

File tree

1 file changed

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

1 file changed

+5
-2
lines changed

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -872,8 +872,11 @@ impl Step for LlvmBitcodeLinker {
872872
fn run(self, builder: &Builder<'_>) -> PathBuf {
873873
let bin_name = "llvm-bitcode-linker";
874874

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

878881
let cargo = prepare_tool_cargo(
879882
builder,

0 commit comments

Comments
 (0)