Skip to content

Commit 1a8c4be

Browse files
authored
Rollup merge of rust-lang#134240 - cuviper:dist-llvm-tools, r=jieyouxu
Only dist `llvm-objcopy` if llvm tools are enabled This uses the same condition that rust-lang#132720 added in the compilation phase. r? ```@jieyouxu```
2 parents b52dd88 + 4c6d793 commit 1a8c4be

File tree

1 file changed

+1
-1
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+1
-1
lines changed

Diff for: src/bootstrap/src/core/build_steps/dist.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,7 @@ impl Step for Rustc {
471471
}
472472
}
473473

474-
{
474+
if builder.config.llvm_enabled(compiler.host) && builder.config.llvm_tools_enabled {
475475
let src_dir = builder.sysroot_target_bindir(compiler, host);
476476
let llvm_objcopy = exe("llvm-objcopy", compiler.host);
477477
let rust_objcopy = exe("rust-objcopy", compiler.host);

0 commit comments

Comments
 (0)