Skip to content

musl: Make rustc-dep-of-std imply musl_v1_2 #5447

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

Open
Gelbpunkt wants to merge 1 commit into
base: main
Choose a base branch
from
Open

musl: Make rustc-dep-of-std imply musl_v1_2 #5447

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
3 changes: 2 additions & 1 deletion build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ fn main() {
_ => (),
}

let mut musl_v1_2 = env_flag("CARGO_CFG_LIBC_UNSTABLE_MUSL_V1_2");
let mut musl_v1_2 =
env_flag("CARGO_CFG_LIBC_UNSTABLE_MUSL_V1_2") || env_flag("CARGO_FEATURE_RUSTC_DEP_OF_STD");
if let Ok(old_musl_v1_2_3) = env::var("CARGO_CFG_LIBC_UNSTABLE_MUSL_V1_2_3") {
println!(
"cargo:warning=`--cfg=libc_unstable_musl_v1_2_3` will be removed; \
Expand Down
26 changes: 10 additions & 16 deletions src/unix/linux_like/linux/musl/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,21 @@ pub type clock_t = c_long;
#[cfg(musl32_time64)]
pub type time_t = i64;
#[cfg(not(musl32_time64))]
#[cfg_attr(
not(feature = "rustc-dep-of-std"),
deprecated(
since = "0.2.80",
note = "This type is changed to 64-bit in musl 1.2.0, \
we'll follow that change in the future release. \
See #1848 for more info."
)
#[deprecated(
since = "0.2.80",
note = "This type is changed to 64-bit in musl 1.2.0, \
we'll follow that change in the future release. \
See #1848 for more info."
)]
pub type time_t = c_long;
#[cfg(musl32_time64)]
pub type suseconds_t = i64;
#[cfg(not(musl32_time64))]
#[cfg_attr(
not(feature = "rustc-dep-of-std"),
deprecated(
since = "0.2.80",
note = "This type is changed to 64-bit in musl 1.2.0, \
we'll follow that change in the future release. \
See #1848 for more info."
)
#[deprecated(
since = "0.2.80",
note = "This type is changed to 64-bit in musl 1.2.0, \
we'll follow that change in the future release. \
See #1848 for more info."
)]
pub type suseconds_t = c_long;
pub type ino_t = u64;
Expand Down