bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

use target compiler on llvm-bitcode-linker

Browse source 
The build compiler is already resolved inside the `ToolBuild` step,
so we should pass only the target compilers for `Mode::ToolRustc` tools.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
This commit is contained in:
onur-ozkan 2025-03-07 09:41:29 +03:00
parent 98a48781fe
commit 422705573c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/bootstrap/src/core/build_steps/compile.rs
View file

@ -1991,12 +1991,12 @@ impl Step for Assemble {
} }
} }
let maybe_install_llvm_bitcode_linker = |compiler| { let maybe_install_llvm_bitcode_linker = || {
if builder.config.llvm_bitcode_linker_enabled { if builder.config.llvm_bitcode_linker_enabled {
trace!("llvm-bitcode-linker enabled, installing"); trace!("llvm-bitcode-linker enabled, installing");
let llvm_bitcode_linker = let llvm_bitcode_linker =
builder.ensure(crate::core::build_steps::tool::LlvmBitcodeLinker { builder.ensure(crate::core::build_steps::tool::LlvmBitcodeLinker {
compiler, compiler: target_compiler,
target: target_compiler.host, target: target_compiler.host,
extra_features: vec![], extra_features: vec![],
}); });
@ -2020,7 +2020,7 @@ impl Step for Assemble {
builder.info(&format!("Creating a sysroot for stage{stage} compiler (use `rustup toolchain link 'name' build/host/stage{stage}`)", stage=target_compiler.stage)); builder.info(&format!("Creating a sysroot for stage{stage} compiler (use `rustup toolchain link 'name' build/host/stage{stage}`)", stage=target_compiler.stage));
} }
maybe_install_llvm_bitcode_linker(target_compiler); maybe_install_llvm_bitcode_linker();
return target_compiler; return target_compiler;
} }
@ -2203,7 +2203,7 @@ impl Step for Assemble {
); );
} }
maybe_install_llvm_bitcode_linker(build_compiler); maybe_install_llvm_bitcode_linker();
// Ensure that `libLLVM.so` ends up in the newly build compiler directory, // Ensure that `libLLVM.so` ends up in the newly build compiler directory,
// so that it can be found when the newly built `rustc` is run. // so that it can be found when the newly built `rustc` is run.