diff options
| author | bors <bors@rust-lang.org> | 2019-05-02 16:46:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-02 16:46:11 +0000 |
| commit | 39ca01c8b3631db48c8e390f93f62e52b51a68b9 (patch) | |
| tree | 508e383ee39e60cef0affdb7fde1b63ee92aa38b | |
| parent | 11f30a8837d051741d0119078acabdb606fac14c (diff) | |
| parent | 3231740da4855de4db306ad41bd781c37ffbde98 (diff) | |
| download | rust-libc-0.2.54.tar.gz | |
Auto merge of #1331 - gnzlbg:revert_1322, r=alexcrichton0.2.54
Revert PR 1322
Reverts PR #1322 .
cc https://github.com/rust-lang/rust/pull/60117
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | src/redox/mod.rs | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/Cargo.toml b/Cargo.toml index a708801e38..e8492974e0 100644 --- a/Cargo.toml +++ b/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" diff --git a/src/redox/mod.rs b/src/redox/mod.rs index 0d2cacc27b..ac0ae00bce 100644 --- a/src/redox/mod.rs +++ b/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::*; |