cfg libc tweak, dont use bridge_types when not needed

sl-sh-dev · Jan 12, 2024 · 9ae90cc · 9ae90cc
1 parent a964792
commit 9ae90cc
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/bridge_macros/Cargo.toml b/bridge_macros/Cargo.toml
@@ -12,5 +12,7 @@ syn = { version = "1.0.95", features = ["full"] }
 quote = "1.0.18"
 static_assertions = "1.1.0"
 bridge_types = { workspace = true }
-trybuild = "1.0.85"
 slvm = { path = "../vm" }
+
+[dev-dependencies]
+trybuild = "1.0.85"
diff --git a/compile_state/Cargo.toml b/compile_state/Cargo.toml
@@ -7,4 +7,3 @@ edition = "2021"
 
 [dependencies]
 slvm = { path = "../vm" }
-bridge_types = { workspace = true }
diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml
@@ -11,7 +11,6 @@ unicode_reader = "1"
 slvm = { path = "../vm" }
 builtins = { path = "../builtins" }
 compile_state = { path = "../compile_state" }
-bridge_types = { workspace = true }
 
 [build-dependencies]
 chrono = "0.4"
diff --git a/shell/src/platform/unix.rs b/shell/src/platform/unix.rs
@@ -25,9 +25,9 @@ use nix::unistd::{self, Uid};
 mod umask;
 
 // macos does not define __rlimit_resource_t...
-#[cfg(target_os = "macos")]
+#[cfg(not(any(target_env = "gnu", target_env = "uclibc")))]
 pub type RlimitResource = nix::libc::c_int;
-#[cfg(not(target_os = "macos"))]
+#[cfg(any(target_env = "gnu", target_env = "uclibc"))]
 pub type RlimitResource = nix::libc::__rlimit_resource_t;
 
 pub struct Sys {}

diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -12,4 +12,3 @@ nohelmet = []
 
 [dependencies]
 unicode-segmentation = "1.10.1"
-bridge_types = { workspace = true }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,3 @@ edition = "2021"

		[dependencies]
		slvm = { path = "../vm" }
		bridge_types = { workspace = true }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,3 @@ nohelmet = []

		[dependencies]
		unicode-segmentation = "1.10.1"
		bridge_types = { workspace = true }