Skip to content

Commit 4968af0

Browse files
authored
Rollup merge of #105418 - BelovDV:fix-libc-hack, r=petrochenkov
fix: remove hack from link.rs This logic implemented in libc. r? `@petrochenkov`
2 parents c75478b + a9cf163 commit 4968af0

File tree

1 file changed

+0
-9
lines changed
  • compiler/rustc_codegen_ssa/src/back

1 file changed

+0
-9
lines changed

compiler/rustc_codegen_ssa/src/back/link.rs

-9
Original file line numberDiff line numberDiff line change
@@ -2352,15 +2352,6 @@ fn add_native_libs_from_crate(
23522352
&search_paths.get_or_init(|| archive_search_paths(sess)),
23532353
);
23542354
} else {
2355-
// HACK/FIXME: Fixup a circular dependency between libgcc and libc
2356-
// with glibc. This logic should be moved to the libc crate.
2357-
if cnum != LOCAL_CRATE
2358-
&& sess.target.os == "linux"
2359-
&& sess.target.env == "gnu"
2360-
&& name == "c"
2361-
{
2362-
cmd.link_staticlib("gcc", false);
2363-
}
23642355
cmd.link_staticlib(name, verbatim)
23652356
}
23662357
}

0 commit comments

Comments
 (0)