diff options
| author | bors <bors@rust-lang.org> | 2021-07-10 21:42:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-07-10 21:42:40 +0000 |
| commit | dfd7b8d03fb93d0e03147d28b3be6d93260fa94d (patch) | |
| tree | 4a4310069f11ed4d0f2fdd3aadaf02fbc67a5fb3 /library/std/src/sys/unix/thread.rs | |
| parent | 432e145bd5a974c5b6f4dd9b352891bd7502b69d (diff) | |
| parent | 5999a5fbdc91ac07d4103095ed532d8cd4d3443b (diff) | |
| download | rust-dfd7b8d03fb93d0e03147d28b3be6d93260fa94d.tar.gz rust-dfd7b8d03fb93d0e03147d28b3be6d93260fa94d.zip | |
Auto merge of #85953 - inquisitivecrystal:weak-linkat-in-fs-hardlink, r=joshtriplett
Fix linker error Currently, `fs::hard_link` determines whether platforms have `linkat` based on the OS, and uses `link` if they don't. However, this heuristic does not work well if a platform provides `linkat` on newer versions but not on older ones. On old MacOS, this currently causes a linking error. This commit fixes `fs::hard_link` by telling it to use `weak!` on macOS. This means that, on that operating system, we now check for `linkat` at runtime and use `link` if it is not available. Fixes #80804. `@rustbot` label T-libs-impl
Diffstat (limited to 'library/std/src/sys/unix/thread.rs')
| -rw-r--r-- | library/std/src/sys/unix/thread.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/library/std/src/sys/unix/thread.rs b/library/std/src/sys/unix/thread.rs index df2ba0a8bc8..879d7160524 100644 --- a/library/std/src/sys/unix/thread.rs +++ b/library/std/src/sys/unix/thread.rs @@ -7,6 +7,8 @@ use crate::ptr; use crate::sys::{os, stack_overflow}; use crate::time::Duration; +#[cfg(any(target_os = "linux", target_os = "solaris", target_os = "illumos"))] +use crate::sys::weak::weak; #[cfg(not(any(target_os = "l4re", target_os = "vxworks")))] pub const DEFAULT_MIN_STACK_SIZE: usize = 2 * 1024 * 1024; #[cfg(target_os = "l4re")] |