about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-12-14 03:54:34 +0100
committerGitHub <noreply@github.com>2024-12-14 03:54:34 +0100
commita53a3ccab41aa2edce6b0c0f185bc4719d67ee5a (patch)
treebb006a657f1be2e6c620197e17276656304ca65f
parente4f908496504cee307996fe2a84a9a23a63ee502 (diff)
parent4c6d793c66993a0f5455f35e73a1549d232c3ae5 (diff)
downloadrust-a53a3ccab41aa2edce6b0c0f185bc4719d67ee5a.tar.gz
rust-a53a3ccab41aa2edce6b0c0f185bc4719d67ee5a.zip
Rollup merge of #134240 - cuviper:dist-llvm-tools, r=jieyouxu
Only dist `llvm-objcopy` if llvm tools are enabled

This uses the same condition that #132720 added in the compilation phase.

r? ``@jieyouxu``
-rw-r--r--src/bootstrap/src/core/build_steps/dist.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index 0c739115165..89b2d73f74a 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -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);