diff options
| author | bors <bors@rust-lang.org> | 2022-12-08 03:04:51 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-08 03:04:51 +0000 |
| commit | f5418b09e84883c4de2e652a147ab9faff4eee29 (patch) | |
| tree | 73cdc4abf6ee71619776094274d19d56569f87a7 /compiler/rustc_codegen_ssa/src | |
| parent | 01fbc5ae789fc0c7a2da71d3cd908451f175e4eb (diff) | |
| parent | 4968af0ee84b3fd0a0bd32fda8caa294c21a2a6a (diff) | |
| download | rust-f5418b09e84883c4de2e652a147ab9faff4eee29.tar.gz rust-f5418b09e84883c4de2e652a147ab9faff4eee29.zip | |
Auto merge of #105425 - matthiaskrgr:rollup-3ngvxmt, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #105267 (Don't ICE in ExprUseVisitor on FRU for non-existent struct) - #105343 (Simplify attribute handling in rustc_ast_lowering) - #105368 (Remove more `ref` patterns from the compiler) - #105400 (normalize before handling simple checks for evaluatability of `ty::Const`) - #105403 (rustdoc: simplify CSS selectors for item table `.stab`) - #105418 (fix: remove hack from link.rs) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 7cb4f5503a1..540f15c89e9 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -2352,15 +2352,6 @@ fn add_native_libs_from_crate( &search_paths.get_or_init(|| archive_search_paths(sess)), ); } else { - // HACK/FIXME: Fixup a circular dependency between libgcc and libc - // with glibc. This logic should be moved to the libc crate. - if cnum != LOCAL_CRATE - && sess.target.os == "linux" - && sess.target.env == "gnu" - && name == "c" - { - cmd.link_staticlib("gcc", false); - } cmd.link_staticlib(name, verbatim) } } |
