Skip to content

Commit

Permalink
Auto merge of #1045 - Amanieu:revert_musl_libgcc, r=alexcrichton
Browse files Browse the repository at this point in the history
Revert "Link to libgcc when statically linking musl"

This causes linker errors due to duplicated symbols. See rust-lang/rust#52157
  • Loading branch information
bors committed Jul 22, 2018
2 parents 72b16d2 + 6777e63 commit 7d2a122
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions src/unix/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -285,18 +285,6 @@ cfg_if! {
// cargo build, don't pull in anything extra as the libstd dep
// already pulls in all libs.
} else if #[cfg(target_env = "musl")] {
// On some architectures (e.g. aarch64) musl depends on some libgcc
// functions (__addtf3, __multf3, __subtf3) for long double arithmetic
// that it uses internally. Unfortunately we don't provide these
// functions in compiler-builtins, so we instead need to get them from
// libgcc.
//
// This is not a problem if we are linking to libc dynamically since the
// libgcc dependency will automatically get picked up by the linker
// then.
#[cfg_attr(feature = "stdbuild",
link(name = "gcc", kind = "static",
cfg(target_feature = "crt-static")))]
#[cfg_attr(feature = "stdbuild",
link(name = "c", kind = "static",
cfg(target_feature = "crt-static")))]
Expand Down

0 comments on commit 7d2a122

Please sign in to comment.