Skip to content
Snippets Groups Projects
Commit 7d2a122f authored by bors's avatar bors
Browse files

Auto merge of #1045 - Amanieu:revert_musl_libgcc, r=alexcrichton

Revert "Link to libgcc when statically linking musl"

This causes linker errors due to duplicated symbols. See https://github.com/rust-lang/rust/pull/52157
parents 72b16d27 6777e634
No related branches found
No related tags found
No related merge requests found
......@@ -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")))]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment