Skip to content

Commit

Permalink
Rollup merge of #105418 - BelovDV:fix-libc-hack, r=petrochenkov
Browse files Browse the repository at this point in the history
fix: remove hack from link.rs

This logic implemented in libc.

r? `@petrochenkov`
  • Loading branch information
matthiaskrgr committed Dec 7, 2022
2 parents c75478b + a9cf163 commit 4968af0
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions compiler/rustc_codegen_ssa/src/back/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down

0 comments on commit 4968af0

Please sign in to comment.