diff options
| author | bors <bors@rust-lang.org> | 2023-12-10 13:51:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-12-10 13:51:55 +0000 |
| commit | befd1eb4ec78e19f0c8628fa75241ea3ed6ec792 (patch) | |
| tree | 4aeba1a2e0d7d06cfedd1e9d23c2f8b7fca98333 /compiler/rustc_codegen_gcc/src/errors.rs | |
| parent | 84f6130fe37b7c18e93ad6b3220ade5aadc571da (diff) | |
| parent | 53031b264ed51f1e828ddb91f6614f61840f6b28 (diff) | |
| download | rust-befd1eb4ec78e19f0c8628fa75241ea3ed6ec792.tar.gz rust-befd1eb4ec78e19f0c8628fa75241ea3ed6ec792.zip | |
Auto merge of #116278 - Kobzol:bootstrap-lld-mode, r=albertlarsan68,petrochenkov
Generalize LLD usage in bootstrap The current usage of using LLD (`rust.use-lld = true`) in bootstrap is a bit messy. What it claimed: > Indicates whether LLD will be used to link Rust crates during bootstrap on > supported platforms. The LLD from the bootstrap distribution will be used > and not the LLD compiled during the bootstrap. What it did: 1) On MSVC, it did indeed use the snapshot compiler's `rust-lld`, but at the same time it was invoking a global `lld` binary (since https://github.com/rust-lang/rust/pull/102101), therefore it wouldn't work if `lld` wasn't available. 2) On other targets, it was just straight up using a global `lld` linker. If it wasn't available, it would fail. This PR (hopefully) cleans up handling of LLD in bootstrap. It introduces a new enum called `LldMode`, which explicitly distinguishes between no LLD, external LLD and self-contained LLD. Since it's non-trivial to provide a custom path to LLD, if an external `lld` is used, the linker binary has to be named exactly `lld` and it has to be available in PATH. In addition, this PR also dog-foods [MCP510](https://github.com/rust-lang/compiler-team/issues/510) in bootstrap. To keep backwards compatibility somewhat, I kept the original `use-lld` flag and mapped the `true` value to `"external"`, which is how it behaved before on Linux and other non-MSVC targets. Having the option to use an external `lld` on Linux should come in handy for testing on CI once MCP510 sets the default linker on Linux to `lld`. Note that thanks to MCP510, currently "self-contained" means that `lld` is used from the stage N-1 compiler (before, we always used `lld` from the snapshot/stage0 compiler). Best reviewed commit by commit. CC `@petrochenkov`
Diffstat (limited to 'compiler/rustc_codegen_gcc/src/errors.rs')
0 files changed, 0 insertions, 0 deletions
