Auto merge of #1331 - gnzlbg:revert_1322, r=alexcrichton

Revert PR 1322

Reverts PR #1322 .

cc rust-lang/rust#60117

Author: bors

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libc"
-version = "0.2.53"
+version = "0.2.54"
 authors = ["The Rust Project Developers"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"

src/redox/mod.rs

@@ -377,11 +377,8 @@ extern {
                  -> ::ssize_t;
 }
 
-#[cfg_attr(feature = "rustc-dep-of-std",
-           link(name = "c", kind = "static",
-                cfg(target_feature = "crt-static")))]
-#[cfg_attr(feature = "rustc-dep-of-std",
-           link(name = "c", cfg(not(target_feature = "crt-static"))))]
+#[link(name = "c")]
+#[link(name = "m")]
 extern {}
 
 pub use self::net::*;