diff options
| author | Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com> | 2022-03-27 11:18:01 -0700 |
|---|---|---|
| committer | Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com> | 2022-03-28 12:52:14 -0700 |
| commit | c2d5c641325fe0859bf991928bbc85089fbe39e0 (patch) | |
| tree | 33d2046a3839b939ea9927207d79554440a93495 | |
| parent | 600ec284838c52d1f6657c2cf0097b58970b133b (diff) | |
| download | rust-c2d5c641325fe0859bf991928bbc85089fbe39e0.tar.gz rust-c2d5c641325fe0859bf991928bbc85089fbe39e0.zip | |
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.
| -rw-r--r-- | library/std/src/sys/unix/fs.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/library/std/src/sys/unix/fs.rs b/library/std/src/sys/unix/fs.rs index b93a3d67771..6a0088a8940 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() |
