@@ -2056,7 +2056,7 @@ impl Step for Assemble {
20562056 if builder. config . llvm_bitcode_linker_enabled {
20572057 trace ! ( "llvm-bitcode-linker enabled, installing" ) ;
20582058 let llvm_bitcode_linker = builder. ensure (
2059- crate :: core:: build_steps:: tool:: LlvmBitcodeLinker :: for_compiler (
2059+ crate :: core:: build_steps:: tool:: LlvmBitcodeLinker :: for_use_by_compiler (
20602060 builder,
20612061 target_compiler,
20622062 ) ,
@@ -2259,9 +2259,11 @@ impl Step for Assemble {
22592259 copy_codegen_backends_to_sysroot ( builder, build_compiler, target_compiler) ;
22602260
22612261 if builder. config . lld_enabled {
2262- let lld_wrapper = builder. ensure (
2263- crate :: core:: build_steps:: tool:: LldWrapper :: for_compiler ( builder, target_compiler) ,
2264- ) ;
2262+ let lld_wrapper =
2263+ builder. ensure ( crate :: core:: build_steps:: tool:: LldWrapper :: for_use_by_compiler (
2264+ builder,
2265+ target_compiler,
2266+ ) ) ;
22652267 copy_lld_artifacts ( builder, lld_wrapper, target_compiler) ;
22662268 }
22672269
@@ -2289,11 +2291,12 @@ impl Step for Assemble {
22892291 // In addition to `rust-lld` also install `wasm-component-ld` when
22902292 // is enabled. This is used by the `wasm32-wasip2` target of Rust.
22912293 if builder. tool_enabled ( "wasm-component-ld" ) {
2292- let wasm_component =
2293- builder . ensure ( crate :: core:: build_steps:: tool:: WasmComponentLd :: for_compiler (
2294+ let wasm_component = builder . ensure (
2295+ crate :: core:: build_steps:: tool:: WasmComponentLd :: for_use_by_compiler (
22942296 builder,
22952297 target_compiler,
2296- ) ) ;
2298+ ) ,
2299+ ) ;
22972300 builder. copy_link (
22982301 & wasm_component. tool_path ,
22992302 & libdir_bin. join ( wasm_component. tool_path . file_name ( ) . unwrap ( ) ) ,
0 commit comments