23 lines
973 B
Diff
23 lines
973 B
Diff
From 4c6d793c66993a0f5455f35e73a1549d232c3ae5 Mon Sep 17 00:00:00 2001
|
|
From: Josh Stone <jistone@redhat.com>
|
|
Date: Thu, 12 Dec 2024 17:06:03 -0800
|
|
Subject: [PATCH] Only dist `llvm-objcopy` if llvm tools are enabled
|
|
|
|
---
|
|
src/bootstrap/src/core/build_steps/dist.rs | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
|
|
index 0c739115165ec..89b2d73f74a81 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);
|