Merge pull request RustPython#3977 from youknowone/ios

Fix iOS build

Author: youknowone

.github/workflows/ci.yaml

@@ -132,6 +132,14 @@ jobs:
       - name: Check compilation for Apple Silicon
         run: cargo check --target aarch64-apple-darwin
         if: runner.os == 'macOS'
+      - name: prepare iOS build
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          target: aarch64-apple-ios
+        if: runner.os == 'macOS'
+      - name: Check compilation for iOS
+        run: cargo check --target aarch64-apple-ios
+        if: runner.os == 'macOS'
 
   exotic_targets:
     name: Ensure compilation on various targets

stdlib/Cargo.toml

@@ -69,7 +69,7 @@ ascii = "1.0.0"
 memmap2 = "0.5.4"
 page_size = "0.4"
 
-[target.'cfg(all(unix, not(target_os = "redox")))'.dependencies]
+[target.'cfg(all(unix, not(target_os = "redox"), not(target_os = "ios")))'.dependencies]
 termios = "0.3.3"
 
 [features]

stdlib/src/lib.rs

@@ -49,7 +49,7 @@ mod scproxy;
 mod select;
 #[cfg(all(not(target_arch = "wasm32"), feature = "ssl"))]
 mod ssl;
-#[cfg(all(unix, not(target_os = "redox")))]
+#[cfg(all(unix, not(target_os = "redox"), not(target_os = "ios")))]
 mod termios;
 
 use rustpython_common as common;
@@ -118,9 +118,12 @@ pub fn get_module_inits() -> impl Iterator<Item = (Cow<'static, str>, StdlibInit
         {
             "_ssl" => ssl::make_module,
         }
-        #[cfg(all(unix, not(target_os = "redox")))]
+        #[cfg(all(unix, not(target_os = "redox"), not(target_os = "ios")))]
         {
             "termios" => termios::make_module,
+        }
+        #[cfg(all(unix, not(target_os = "redox")))]
+        {
             "resource" => resource::make_module,
         }
         #[cfg(unix)]

stdlib/src/posixsubprocess.rs

@@ -217,7 +217,7 @@ fn close_fds(above: i32, keep: &[i32]) -> nix::Result<()> {
     target_os = "freebsd",
     target_os = "netbsd",
     target_os = "openbsd",
-    target_os = "macos",
+    target_vendor = "apple",
 ))]
 const FD_DIR_NAME: &[u8] = b"/dev/fd\0";
 

vm/src/stdlib/posix.rs

@@ -444,7 +444,7 @@ pub mod module {
                 )
             })
         }
-        #[cfg(not(target_os = "macos"))]
+        #[cfg(not(target_vendor = "apple"))]
         fn mknod(self, vm: &VirtualMachine) -> PyResult<()> {
             let ret = match self.dir_fd.get_opt() {
                 None => self._mknod(vm)?,
@@ -463,7 +463,7 @@ pub mod module {
                 Ok(())
             }
         }
-        #[cfg(target_os = "macos")]
+        #[cfg(target_vendor = "apple")]
         fn mknod(self, vm: &VirtualMachine) -> PyResult<()> {
             let ret = self._mknod(vm)?;
             if ret != 0 {

vm/src/stdlib/signal.rs

@@ -72,7 +72,7 @@ pub(crate) mod _signal {
 
     #[cfg(unix)]
     #[cfg(not(any(
-        target_os = "macos",
+        target_vendor = "apple",
         target_os = "openbsd",
         target_os = "freebsd",
         target_os = "netbsd"

vm/src/stdlib/time.rs

@@ -226,7 +226,7 @@ mod time {
 
     #[cfg(not(any(
         windows,
-        target_os = "macos",
+        target_vendor = "apple",
         target_os = "android",
         target_os = "dragonfly",
         target_os = "freebsd",
@@ -460,6 +460,7 @@ mod unix {
     }
 
     #[cfg(not(target_os = "redox"))]
+    #[cfg(any(not(target_vendor = "apple"), target_os = "macos"))]
     fn set_clock_time(
         clk_id: PyIntRef,
         timespec: libc::timespec,
@@ -473,6 +474,7 @@ mod unix {
     }
 
     #[cfg(not(target_os = "redox"))]
+    #[cfg(any(not(target_vendor = "apple"), target_os = "macos"))]
     #[pyfunction]
     fn clock_settime(
         clk_id: PyIntRef,
@@ -492,6 +494,7 @@ mod unix {
     }
 
     #[cfg(not(target_os = "redox"))]
+    #[cfg(any(not(target_vendor = "apple"), target_os = "macos"))]
     #[pyfunction]
     fn clock_settime_ns(clk_id: PyIntRef, time: PyIntRef, vm: &VirtualMachine) -> PyResult<()> {
         let time: libc::time_t = time.try_to_primitive(vm)?;