nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-14 02:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #138148 - onur-ozkan:fix-llvm-bitcode-build, r=jieyouxu

Browse Source 
use target compiler on llvm-bitcode-linker

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

Fixes https://github.com/rust-lang/rust/issues/138123

r? ghost

try-job: dist-powerpc64le-linux
This commit is contained in:
bors 2025-03-07 16:49:59 +00:00
commit c53af1ccd0
1 changed files with 4 additions and 4 deletions
Show Stats 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 {
trace!("llvm-bitcode-linker enabled, installing");
let llvm_bitcode_linker =
builder.ensure(crate::core::build_steps::tool::LlvmBitcodeLinker {
compiler,
compiler: target_compiler,
target: target_compiler.host,
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));
}
maybe_install_llvm_bitcode_linker(target_compiler);
maybe_install_llvm_bitcode_linker();
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,
// so that it can be found when the newly built `rustc` is run.