user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Also test LldWrapper and remove llvm-config override from tests

Browse source
This commit is contained in:
Jakub Beránek 2025-07-08 11:49:08 +02:00
parent fd37722001
commit b14323aedc
No known key found for this signature in database
GPG key ID: 909CD0D26483516B
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/bootstrap/src/core/build_steps/tool.rs
View file

@ -910,6 +910,13 @@ impl Step for LldWrapper {
tool_result
}
fn metadata(&self) -> Option<StepMetadata> {
Some(
StepMetadata::build("LldWrapper", self.target_compiler.host)
.built_by(self.build_compiler),
)
}
}
#[derive(Debug, Clone, Hash, PartialEq, Eq)]

4
src/bootstrap/src/core/builder/tests.rs
View file

@ -764,13 +764,15 @@ mod snapshot {
ctx
.config("build")
.stage(2)
.args(&["--set", "rust.llvm-bitcode-linker=true"])
.args(&["--set", "rust.lld=true", "--set", "rust.llvm-bitcode-linker=true"])
.render_steps(), @r"
[build] llvm <host>
[build] rustc 0 <host> -> rustc 1 <host>
[build] rustc 0 <host> -> LldWrapper 1 <host>
[build] rustc 1 <host> -> LlvmBitcodeLinker 2 <host>
[build] rustc 1 <host> -> std 1 <host>
[build] rustc 1 <host> -> rustc 2 <host>
[build] rustc 1 <host> -> LldWrapper 2 <host>
[build] rustc 2 <host> -> LlvmBitcodeLinker 3 <host>
[build] rustc 2 <host> -> std 2 <host>
[build] rustdoc 1 <host>

2
src/bootstrap/src/utils/tests/mod.rs
View file

@ -96,8 +96,6 @@ impl ConfigBuilder {
// in-tree LLVM from sources.
self.args.push("--set".to_string());
self.args.push("llvm.download-ci-llvm=false".to_string());
self.args.push("--set".to_string());
self.args.push(format!("target.'{}'.llvm-config=false", get_host_target()));
// Do not mess with the local rustc checkout build directory
self.args.push("--build-dir".to_string());