Rollup merge of #134240 - cuviper:dist-llvm-tools, r=jieyouxu

matthiaskrgr · web-flow · commit a53a3ccab41a · 2024-12-14T03:54:34.000+01:00
Only dist `llvm-objcopy` if llvm tools are enabled This uses the same condition that #132720 added in the compilation phase. r? ``@jieyouxu``
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -471,7 +471,7 @@ impl Step for Rustc {`
`471`	`471`	`}`
`472`	`472`	`}`
`473`	`473`
`474`		`- {`
	`474`	`+ if builder.config.llvm_enabled(compiler.host) && builder.config.llvm_tools_enabled {`
`475`	`475`	`let src_dir = builder.sysroot_target_bindir(compiler, host);`
`476`	`476`	`let llvm_objcopy = exe("llvm-objcopy", compiler.host);`
`477`	`477`	`let rust_objcopy = exe("rust-objcopy", compiler.host);`