From 9ffd0fe5a75b8eb640f0bd94385c7b5f675c7e95 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 26 Jul 2016 16:17:14 -0500 Subject: arm-musl targets now use cfg(env = "musl") --- src/libstd/rtdeps.rs | 4 +--- src/libstd/sys/unix/thread.rs | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'src/libstd') 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", -- cgit 1.4.1-3-g733a5