Skip to content

arm-musl targets now use cfg(target_env = "musl") #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2016
Merged

arm-musl targets now use cfg(target_env = "musl") #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/unix/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@ s! {
pub ru_nvcsw: c_long,
pub ru_nivcsw: c_long,

#[cfg(any(target_env = "musl",
target_env = "musleabi",
target_env = "musleabihf"))]
#[cfg(any(target_env = "musl"))]
__reserved: [c_long; 16],
}

Expand Down Expand Up @@ -199,9 +197,7 @@ cfg_if! {
} else if #[cfg(all(not(stdbuild), feature = "use_std"))] {
// cargo build, don't pull in anything extra as the libstd dep
// already pulls in all libs.
} else if #[cfg(any(all(target_env = "musl", not(target_arch = "mips")),
target_env = "musleabi",
target_env = "musleabihf"))] {
} else if #[cfg(any(all(target_env = "musl", not(target_arch = "mips"))))] {
#[link(name = "c", kind = "static")]
extern {}
} else if #[cfg(target_os = "emscripten")] {
Expand Down
10 changes: 2 additions & 8 deletions src/unix/notbsd/linux/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,9 @@ s! {
}

pub struct pthread_cond_t {
#[cfg(any(target_env = "musl",
target_env = "musleabi",
target_env = "musleabihf"))]
#[cfg(any(target_env = "musl"))]
__align: [*const ::c_void; 0],
#[cfg(not(any(target_env = "musl",
target_env = "musleabi",
target_env = "musleabihf")))]
#[cfg(not(any(target_env = "musl")))]
__align: [::c_longlong; 0],
size: [u8; __SIZEOF_PTHREAD_COND_T],
}
Expand Down Expand Up @@ -663,8 +659,6 @@ extern {

cfg_if! {
if #[cfg(any(target_env = "musl",
target_env = "musleabi",
target_env = "musleabihf",
target_os = "emscripten"))] {
mod musl;
pub use self::musl::*;
Expand Down
16 changes: 4 additions & 12 deletions src/unix/notbsd/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,21 +100,13 @@ s! {

pub struct sched_param {
pub sched_priority: ::c_int,
#[cfg(any(target_env = "musl",
target_env = "musleabi",
target_env = "musleabihf"))]
#[cfg(any(target_env = "musl"))]
pub sched_ss_low_priority: ::c_int,
#[cfg(any(target_env = "musl",
target_env = "musleabi",
target_env = "musleabihf"))]
#[cfg(any(target_env = "musl"))]
pub sched_ss_repl_period: ::timespec,
#[cfg(any(target_env = "musl",
target_env = "musleabi",
target_env = "musleabihf"))]
#[cfg(any(target_env = "musl"))]
pub sched_ss_init_budget: ::timespec,
#[cfg(any(target_env = "musl",
target_env = "musleabi",
target_env = "musleabihf"))]
#[cfg(any(target_env = "musl"))]
pub sched_ss_max_repl: ::c_int,
}

Expand Down