diff options
| author | bors <bors@rust-lang.org> | 2024-06-27 08:03:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-06-27 08:03:17 +0000 |
| commit | b280af45f430d1efc85d7e4fcc4933d4ec9f94b2 (patch) | |
| tree | 8dd2cf6a454a8d2a3d3d3f456e7c36361eb9f09e /compiler/rustc_codegen_ssa/src | |
| parent | fc94ce216ede9f89a1032b13e2563ddba0ae4194 (diff) | |
| parent | 4cc16a53aeea6b82d05e665cb4bcbcddb1e2d7be (diff) | |
| download | rust-b280af45f430d1efc85d7e4fcc4933d4ec9f94b2.tar.gz rust-b280af45f430d1efc85d7e4fcc4933d4ec9f94b2.zip | |
Auto merge of #3713 - rust-lang:rustup-2024-06-27, r=RalfJung
Automatic Rustup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index c352100b01b..d509e4ce56d 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1490,11 +1490,6 @@ fn print_native_static_libs( let mut lib_args: Vec<_> = all_native_libs .iter() .filter(|l| relevant_lib(sess, l)) - // Deduplication of successive repeated libraries, see rust-lang/rust#113209 - // - // note: we don't use PartialEq/Eq because NativeLib transitively depends on local - // elements like spans, which we don't care about and would make the deduplication impossible - .dedup_by(|l1, l2| l1.name == l2.name && l1.kind == l2.kind && l1.verbatim == l2.verbatim) .filter_map(|lib| { let name = lib.name; match lib.kind { @@ -1521,6 +1516,8 @@ fn print_native_static_libs( | NativeLibKind::RawDylib => None, } }) + // deduplication of consecutive repeated libraries, see rust-lang/rust#113209 + .dedup() .collect(); for path in all_rust_dylibs { // FIXME deduplicate with add_dynamic_crate |