diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2016-07-26 16:17:14 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2016-07-30 15:39:13 -0500 |
| commit | 9ffd0fe5a75b8eb640f0bd94385c7b5f675c7e95 (patch) | |
| tree | 5e647dbeb8aba3e0bf88cff9a50fb12f1f5eb010 /src/libstd | |
| parent | f7247d1071206db45103c994b0077fcb0d8f75cf (diff) | |
| download | rust-9ffd0fe5a75b8eb640f0bd94385c7b5f675c7e95.tar.gz rust-9ffd0fe5a75b8eb640f0bd94385c7b5f675c7e95.zip | |
arm-musl targets now use cfg(env = "musl")
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/rtdeps.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sys/unix/thread.rs | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/libstd/rtdeps.rs b/src/libstd/rtdeps.rs index f23ac32f51c..c2572dfa5e1 100644 --- a/src/libstd/rtdeps.rs +++ b/src/libstd/rtdeps.rs @@ -19,9 +19,7 @@ // // On Linux, librt and libdl are indirect dependencies via std, // and binutils 2.22+ won't add them automatically -#[cfg(all(target_os = "linux", not(any(target_env = "musl", - target_env = "musleabi", - target_env = "musleabihf"))))] +#[cfg(all(target_os = "linux", not(any(target_env = "musl"))))] #[link(name = "dl")] #[link(name = "pthread")] extern {} diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index 7f05aec4e6e..65ebce0baa2 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -171,9 +171,7 @@ impl Drop for Thread { } } -#[cfg(all(not(all(target_os = "linux", not(any(target_env = "musl", - target_env = "musleabi", - target_env = "musleabihf")))), +#[cfg(all(not(all(target_os = "linux", not(any(target_env = "musl")))), not(target_os = "freebsd"), not(target_os = "macos"), not(target_os = "bitrig"), @@ -187,9 +185,7 @@ pub mod guard { } -#[cfg(any(all(target_os = "linux", not(any(target_env = "musl", - target_env = "musleabi", - target_env = "musleabihf"))), +#[cfg(any(all(target_os = "linux", not(any(target_env = "musl"))), target_os = "freebsd", target_os = "macos", target_os = "bitrig", |