diff options
| author | Alexander Polakov <plhk@sdf.org> | 2015-11-21 02:02:30 +0300 |
|---|---|---|
| committer | Alexander Polakov <plhk@sdf.org> | 2015-11-21 02:02:30 +0300 |
| commit | 5d86064fc5e8013f099d8256a748f4d2562be350 (patch) | |
| tree | 202644552a94dfbccf8d495284e5abebb30662a0 | |
| parent | 69ca9e95983b3f234c6592b8103d6aef5b0b4c41 (diff) | |
| parent | 453add48b8f071853d69166fd250ccb57339db71 (diff) | |
| download | rust-libc-5d86064fc5e8013f099d8256a748f4d2562be350.tar.gz | |
Merge branch 'master' into netlink
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | src/unix/mod.rs | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index c53fcf1e21..fab85e7794 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: rust sudo: required +dist: trusty rust: - 1.0.0 - beta diff --git a/src/unix/mod.rs b/src/unix/mod.rs index 93dd856b1e..3dc7f626b4 100644 --- a/src/unix/mod.rs +++ b/src/unix/mod.rs @@ -105,9 +105,14 @@ cfg_if! { } else if #[cfg(target_env = "musl")] { #[link(name = "c", kind = "static")] extern {} + } else if #[cfg(any(target_os = "macos", target_os = "ios"))] { + #[link(name = "c")] + #[link(name = "m")] + extern {} } else { #[link(name = "c")] #[link(name = "m")] + #[link(name = "rt")] extern {} } } |