diff options
| author | bors <bors@rust-lang.org> | 2025-07-31 12:04:04 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-07-31 12:04:04 +0000 |
| commit | 3fb1b53a9dbfcdf37a4b67d35cde373316829930 (patch) | |
| tree | 6d9cd701ae6cf01e27b08a9a59a2faa188840810 /compiler | |
| parent | 64ca23b6235732fa61c0a2b957c5d7e591e7c972 (diff) | |
| parent | 97e2806caae1142585bccadd9380bb304d0605b2 (diff) | |
| download | rust-3fb1b53a9dbfcdf37a4b67d35cde373316829930.tar.gz rust-3fb1b53a9dbfcdf37a4b67d35cde373316829930.zip | |
Auto merge of #144731 - samueltardieu:rollup-36y30k2, r=samueltardieu
Rollup of 4 pull requests Successful merges: - rust-lang/rust#136840 (Fix linker-plugin-lto only doing thin lto) - rust-lang/rust#144053 (Remove install Rust script from CI) - rust-lang/rust#144297 (Make `libtest::ERROR_EXIT_CODE` const public to not redefine it in rustdoc) - rust-lang/rust#144721 (`std_detect`: Linux 6.16 support for RISC-V) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/write.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/write.rs b/compiler/rustc_codegen_ssa/src/back/write.rs index 6773d3e24e9..aa29afb7f5b 100644 --- a/compiler/rustc_codegen_ssa/src/back/write.rs +++ b/compiler/rustc_codegen_ssa/src/back/write.rs @@ -214,7 +214,9 @@ impl ModuleConfig { false ), emit_obj, - emit_thin_lto: sess.opts.unstable_opts.emit_thin_lto, + // thin lto summaries prevent fat lto, so do not emit them if fat + // lto is requested. See PR #136840 for background information. + emit_thin_lto: sess.opts.unstable_opts.emit_thin_lto && sess.lto() != Lto::Fat, emit_thin_lto_summary: if_regular!( sess.opts.output_types.contains_key(&OutputType::ThinLinkBitcode), false |