fix: restore cross-target host env builds

Copilot · youknowone · youknowone · commit 9707aebcb490 · 2026-04-12T23:35:22.000+09:00
Agent-Logs-Url: https://github.com/RustPython/RustPython/sessions/ca126bcb-b77c-4c2a-8ab1-545bbc828aa7 Co-authored-by: youknowone <69878+youknowone@users.noreply.github.com>
diff --git a/crates/host_env/Cargo.toml b/crates/host_env/Cargo.toml
@@ -16,6 +16,8 @@ num-traits = { workspace = true }
 
 [target.'cfg(unix)'.dependencies]
 nix = { workspace = true }
+
+[target.'cfg(all(unix, not(target_os = "ios"), not(target_os = "redox")))'.dependencies]
 termios = "0.3.3"
 
 [target.'cfg(windows)'.dependencies]
diff --git a/crates/host_env/src/fcntl.rs b/crates/host_env/src/fcntl.rs
@@ -1,15 +1,5 @@
 use std::io;
 
-#[cfg(target_os = "wasi")]
-fn ioctl_request(request: libc::c_ulong) -> libc::c_int {
-    request as _
-}
-
-#[cfg(not(target_os = "wasi"))]
-fn ioctl_request(request: libc::c_ulong) -> libc::c_ulong {
-    request
-}
-
 pub fn fcntl_int(fd: i32, cmd: i32, arg: i32) -> io::Result<i32> {
     let ret = unsafe { libc::fcntl(fd, cmd, arg) };
     if ret < 0 {
@@ -37,7 +27,7 @@ pub unsafe fn ioctl_ptr(
     request: libc::c_ulong,
     arg: *mut libc::c_void,
 ) -> io::Result<i32> {
-    let ret = unsafe { libc::ioctl(fd, ioctl_request(request), arg) };
+    let ret = unsafe { libc::ioctl(fd, request as _, arg) };
     if ret < 0 {
         Err(io::Error::last_os_error())
     } else {
@@ -46,7 +36,7 @@ pub unsafe fn ioctl_ptr(
 }
 
 pub fn ioctl_int(fd: i32, request: libc::c_ulong, arg: i32) -> io::Result<i32> {
-    let ret = unsafe { libc::ioctl(fd, ioctl_request(request), arg) };
+    let ret = unsafe { libc::ioctl(fd, request as _, arg) };
     if ret < 0 {
         Err(io::Error::last_os_error())
     } else {
diff --git a/crates/vm/src/stdlib/msvcrt.rs b/crates/vm/src/stdlib/msvcrt.rs
@@ -8,7 +8,7 @@ mod msvcrt {
         PyRef, PyResult, VirtualMachine,
         builtins::{PyBytes, PyStrRef},
         convert::IntoPyException,
-        host_env::{crt_fd, suppress_iph},
+        host_env::crt_fd,
     };
     use itertools::Itertools;
     use rustpython_host_env::msvcrt as host_msvcrt;
diff --git a/crates/vm/src/stdlib/nt.rs b/crates/vm/src/stdlib/nt.rs
@@ -283,7 +283,7 @@ pub(crate) mod module {
     }
 
     fn win32_lchmod(path: &OsPath, mode: u32, vm: &VirtualMachine) -> PyResult<()> {
-        host_nt::win32_lchmod(path.as_os_str(), mode, S_IWRITE)
+        host_nt::win32_lchmod(path.path.as_os_str(), mode, S_IWRITE)
             .map_err(|err| OSErrorBuilder::with_filename(&err, path.clone(), vm))
     }
 

Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ pub(crate) mod module {`
`283`	`283`	`}`
`284`	`284`
`285`	`285`	`fn win32_lchmod(path: &OsPath, mode: u32, vm: &VirtualMachine) -> PyResult<()> {`
`286`		`- host_nt::win32_lchmod(path.as_os_str(), mode, S_IWRITE)`
	`286`	`+ host_nt::win32_lchmod(path.path.as_os_str(), mode, S_IWRITE)`
`287`	`287`	`.map_err(\|err\| OSErrorBuilder::with_filename(&err, path.clone(), vm))`
`288`	`288`	`}`
`289`	`289`