Skip to content

Commit 4ff4f36

Browse files
authored
Unrolled build for rust-lang#135001
Rollup merge of rust-lang#135001 - Kobzol:bootstrap-mcp-510, r=onur-ozkan Allow using self-contained LLD in bootstrap In rust-lang#116278, I added a `"self-contained"` mode to the `rust.use-lld` bootstrap option, which was designed for using the built-in LLD for linking compiler artifacts. However, this was later reverted in rust-lang#118810. This PR brings the old logic back, which switches LLD in bootstrap from `-fuse-ld=lld` to [MCP510](rust-lang/compiler-team#510 way of passing linker flags to enable LLD (both external and self-contained). So this does two changes: 1) Goes from `-fuse-ld=lld` to MCP510 2) Actually makes it possible to use the self-contained LLD to compile compiler artifacts Regarding the second commit: Since rust-lang#86113, we have been passing `-fuse-ld=lld` as a target flag to all tests when `use-lld = true` is enabled. This kind of worked for all tests, since it was just a linker argument, which has bypassed any compiler checks, and probably resulted only in some warning if the given target linker didn't actually support LLD. However, after the first commit, some tests actually start failing with this approach: ``` error: linker flavor `gnu-lld-cc` is incompatible with the current target | = note: compatible flavors are: llbc, ptx ``` So the second commit removes the passing of LLD flags as target flags to tests. I don't think that it's a good idea to pass specific compiler flags to all tests unconditionally, tbh. The doctest command from rust-lang#86113 doesn't go through compiletest anymore, and doctests should be quite a lot faster since rust-lang#126245 in general. CC `@the8472` If someone has a beefy machine, it would be nice to test whether this doesn't regress test execution speed. How to do that: 1) Enable `rust.use-lld = true` and `rust.lld = true` in `config.toml` 2) Benchmark `./x test tests/ui --force-rerun` between `master` and this PR Once this is tested in the wild, I would like to make the self-contained LLD the default in CI, hopefully to make CI builds faster. r? `@onur-ozkan`
2 parents 49761b0 + 3d69dd1 commit 4ff4f36

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

src/bootstrap/src/core/build_steps/test.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1893,7 +1893,6 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
18931893

18941894
let mut targetflags = flags;
18951895
targetflags.push(format!("-Lnative={}", builder.test_helpers_out(target).display()));
1896-
targetflags.extend(linker_flags(builder, compiler.host, LldThreads::No));
18971896
for flag in targetflags {
18981897
cmd.arg("--target-rustcflags").arg(flag);
18991898
}

src/bootstrap/src/utils/helpers.rs

+14-1
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,20 @@ pub fn linker_flags(
481481
) -> Vec<String> {
482482
let mut args = vec![];
483483
if !builder.is_lld_direct_linker(target) && builder.config.lld_mode.is_used() {
484-
args.push(String::from("-Clink-arg=-fuse-ld=lld"));
484+
match builder.config.lld_mode {
485+
LldMode::External => {
486+
args.push("-Clinker-flavor=gnu-lld-cc".to_string());
487+
// FIXME(kobzol): remove this flag once MCP510 gets stabilized
488+
args.push("-Zunstable-options".to_string());
489+
}
490+
LldMode::SelfContained => {
491+
args.push("-Clinker-flavor=gnu-lld-cc".to_string());
492+
args.push("-Clink-self-contained=+linker".to_string());
493+
// FIXME(kobzol): remove this flag once MCP510 gets stabilized
494+
args.push("-Zunstable-options".to_string());
495+
}
496+
LldMode::Unused => unreachable!(),
497+
};
485498

486499
if matches!(lld_threads, LldThreads::No) {
487500
args.push(format!(

0 commit comments

Comments
 (0)