Enable statx on musl-libc

Version 1.2.5 of musl-libc added support for the statx system call[1]. [1]: https://musl.libc.org/releases.html
rust-lang · Nov 30, 2024 · 60265ba · 60265ba
1 parent 9e861d6
commit 60265ba
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/ci/install-musl.sh b/ci/install-musl.sh
@@ -5,7 +5,7 @@
 
 set -eux
 
-musl_version=1.1.24
+musl_version=1.2.5
 musl="musl-${musl_version}"
 
 # Download, configure, build, and install musl:

diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
@@ -213,7 +213,11 @@ s! {
 }
 
 cfg_if! {
-    if #[cfg(any(target_env = "gnu", target_os = "android"))] {
+    if #[cfg(any(
+        target_env = "gnu",
+        target_os = "android",
+        target_env = "musl"
+    ))] {
         s! {
             pub struct statx {
                 pub stx_mask: crate::__u32,
@@ -1577,7 +1581,11 @@ cfg_if! {
 }
 
 cfg_if! {
-    if #[cfg(any(target_env = "gnu", target_os = "android"))] {
+    if #[cfg(any(
+        target_env = "gnu",
+        target_os = "android",
+        target_env = "musl"
+    ))] {
         pub const AT_STATX_SYNC_TYPE: c_int = 0x6000;
         pub const AT_STATX_SYNC_AS_STAT: c_int = 0x0000;
         pub const AT_STATX_FORCE_SYNC: c_int = 0x2000;
@@ -1980,7 +1988,11 @@ cfg_if! {
 
 // The statx syscall, available on some libcs.
 cfg_if! {
-    if #[cfg(any(target_env = "gnu", target_os = "android"))] {
+    if #[cfg(any(
+        target_env = "gnu",
+        target_os = "android",
+        target_env = "musl"
+    ))] {
         extern "C" {
             pub fn statx(
                 dirfd: c_int,