to handle musl systems

mitnk · Sep 29, 2024 · 4212a95 · 4212a95
1 parent b035739
commit 4212a95
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 edition = "2021"
 build = "src/build.rs"
 name = "cicada"
-version = "1.0.2"
+version = "1.0.3-dev"
 authors = ["Hugo Wang <w@mitnk.com>"]
 
 description = "A simple Bash-like Unix shell."

diff --git a/src/builtins/ulimit.rs b/src/builtins/ulimit.rs
@@ -77,15 +77,23 @@ fn set_limit(limit_name: &str, value: u64, for_hard: bool) -> String {
         }
     }
 
-    // to support armv7-unknown-linux-gnueabihf
+    // to support armv7-linux-gnueabihf & 32-bit musl systems
     if for_hard {
-        #[cfg(target_pointer_width = "32")]
+        #[cfg(all(target_pointer_width = "32", not(target_env = "musl")))]
         { rlp.rlim_max = value as u32; }
+
+        #[cfg(all(target_pointer_width = "32", target_env = "musl"))]
+        { rlp.rlim_max = value as u64; }
+
         #[cfg(target_pointer_width = "64")]
         { rlp.rlim_max = value; }
     } else {
-        #[cfg(target_pointer_width = "32")]
+        #[cfg(all(target_pointer_width = "32", not(target_env = "musl")))]
         { rlp.rlim_cur = value as u32; }
+
+        #[cfg(all(target_pointer_width = "32", target_env = "musl"))]
+        { rlp.rlim_cur = value as u64; }
+
         #[cfg(target_pointer_width = "64")]
         { rlp.rlim_cur = value; }
     }