From c2d5c641325fe0859bf991928bbc85089fbe39e0 Mon Sep 17 00:00:00 2001 From: Marcus Calhoun-Lopez Date: Sun, 27 Mar 2022 11:18:01 -0700 Subject: [PATCH] Fix build on i686-apple-darwin systems Replace `target_arch = "x86_64"` with `not(target_arch = "aarch64")` so that i686-apple-darwin systems dynamically choose implementation. --- library/std/src/sys/unix/fs.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs index b93a3d677711f..6a0088a8940dc 100644 --- a/library/std/src/sys/unix/fs.rs +++ b/library/std/src/sys/unix/fs.rs @@ -1535,12 +1535,12 @@ mod remove_dir_impl { use crate::sync::Arc; use crate::sys::{cvt, cvt_r}; - #[cfg(not(all(target_os = "macos", target_arch = "x86_64"),))] + #[cfg(not(all(target_os = "macos", not(target_arch = "aarch64")),))] use libc::{fdopendir, openat, unlinkat}; - #[cfg(all(target_os = "macos", target_arch = "x86_64"))] + #[cfg(all(target_os = "macos", not(target_arch = "aarch64")))] use macos_weak::{fdopendir, openat, unlinkat}; - #[cfg(all(target_os = "macos", target_arch = "x86_64"))] + #[cfg(all(target_os = "macos", not(target_arch = "aarch64")))] mod macos_weak { use crate::sys::weak::weak; use libc::{c_char, c_int, DIR}; @@ -1699,12 +1699,12 @@ mod remove_dir_impl { } } - #[cfg(not(all(target_os = "macos", target_arch = "x86_64")))] + #[cfg(not(all(target_os = "macos", not(target_arch = "aarch64"))))] pub fn remove_dir_all(p: &Path) -> io::Result<()> { remove_dir_all_modern(p) } - #[cfg(all(target_os = "macos", target_arch = "x86_64"))] + #[cfg(all(target_os = "macos", not(target_arch = "aarch64")))] pub fn remove_dir_all(p: &Path) -> io::Result<()> { if macos_weak::has_openat() { // openat() is available with macOS 10.10+, just like unlinkat() and fdopendir()