diff options
author | bors <bors@rust-lang.org> | 2018-01-24 02:38:22 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2018-01-24 02:38:22 +0000 |
commit | 56444a4545bd71430d64b86b8a71714cfdbe9f5d (patch) | |
tree | 5316084c989ee93b58e98344eef17cf2d5b490fb | |
parent | 9613051cd9c462b6290d6ccb720c9b327bec47e3 (diff) | |
parent | 042b7070bc9a55741f73dc7b5210d9e417a59332 (diff) | |
download | rust-libc-56444a4545bd71430d64b86b8a71714cfdbe9f5d.tar.gz |
Auto merge of #908 - malbarbo:musl-mips-static, r=alexcrichton
Do not assume dynamic linking in musl/mips targets
-rw-r--r-- | src/unix/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/unix/mod.rs b/src/unix/mod.rs index 496bb738a5..0d344edc5f 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -276,7 +276,7 @@ cfg_if! { } else if #[cfg(feature = "use_std")] { // cargo build, don't pull in anything extra as the libstd dep // already pulls in all libs. - } else if #[cfg(any(all(target_env = "musl", not(target_arch = "mips"))))] { + } else if #[cfg(target_env = "musl")] { #[link(name = "c", kind = "static", cfg(target_feature = "crt-static"))] #[link(name = "c", cfg(not(target_feature = "crt-static")))] extern {} |