diff options
| author | bors <bors@rust-lang.org> | 2019-04-19 18:45:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-19 18:45:37 +0000 |
| commit | a79c2d4d78bfc49776a506557df3f64730cdebfd (patch) | |
| tree | ad2a75e7e3e2c1f134ceb4cf222c13d871a19558 | |
| parent | 0d0163380ad0b1a848ca17eddecb454648a52088 (diff) | |
| parent | 319b7b5b4c5a7d02269c79d14e139b1eefae677e (diff) | |
| download | rust-libc-a79c2d4d78bfc49776a506557df3f64730cdebfd.tar.gz | |
Auto merge of #1322 - redox-os:redox, r=gnzlbg
redox: support crt-static
This reuses the code from musl to add support to Redox for crt-static.
Linking to `m` is also unnecessary as it is included in `c`
| -rw-r--r-- | src/redox/mod.rs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/redox/mod.rs b/src/redox/mod.rs index ac0ae00bce..0d2cacc27b 100644 --- a/src/redox/mod.rs +++ b/src/redox/mod.rs @@ -377,8 +377,11 @@ extern { -> ::ssize_t; } -#[link(name = "c")] -#[link(name = "m")] +#[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"))))] extern {} pub use self::net::*; |