Skip to content

Commit

Permalink
Unrolled build for rust-lang#134240
Browse files Browse the repository at this point in the history
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``
  • Loading branch information
rust-timer authored Dec 14, 2024
2 parents 4a204be + 4c6d793 commit a28b229
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/src/core/build_steps/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ impl Step for Rustc {
}
}

{
if builder.config.llvm_enabled(compiler.host) && builder.config.llvm_tools_enabled {
let src_dir = builder.sysroot_target_bindir(compiler, host);
let llvm_objcopy = exe("llvm-objcopy", compiler.host);
let rust_objcopy = exe("rust-objcopy", compiler.host);
Expand Down

0 comments on commit a28b229

Please sign in to comment.