diff options
| author | bors <bors@rust-lang.org> | 2022-12-24 10:46:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-12-24 10:46:43 +0000 |
| commit | 8766bbdc30a297aaa249193f5513fb261ccef17c (patch) | |
| tree | 4b6141e66c79bd3545e280cabe09e22cd3342dcb /library/std/src/sys/unix/thread.rs | |
| parent | 5e8bab91d339037388d152fd5066c26ae707d54e (diff) | |
| parent | 750bf73aea78a613456dc93f34cc32e43e9252f8 (diff) | |
| download | rust-8766bbdc30a297aaa249193f5513fb261ccef17c.tar.gz rust-8766bbdc30a297aaa249193f5513fb261ccef17c.zip | |
Auto merge of #106111 - matthiaskrgr:rollup-nnpoe5h, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #105465 (Improve top-level docs) - #105872 (Suggest remove last method call when type coerce with expected type) - #106032 (std: only use LFS function on glibc) - #106078 (Provide more context on FileCheck failures) - #106100 (Codegen test for derived `<` on trivial newtype [TEST ONLY]) - #106109 (rustdoc: make line number CSS for doc comment and scraped the same) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys/unix/thread.rs')
| -rw-r--r-- | library/std/src/sys/unix/thread.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/sys/unix/thread.rs b/library/std/src/sys/unix/thread.rs index d454a2a717c..d847f2775ab 100644 --- a/library/std/src/sys/unix/thread.rs +++ b/library/std/src/sys/unix/thread.rs @@ -653,9 +653,9 @@ pub mod guard { ))] #[cfg_attr(test, allow(dead_code))] pub mod guard { - #[cfg(not(target_os = "linux"))] + #[cfg(not(all(target_os = "linux", target_env = "gnu")))] use libc::{mmap as mmap64, mprotect}; - #[cfg(target_os = "linux")] + #[cfg(all(target_os = "linux", target_env = "gnu"))] use libc::{mmap64, mprotect}; use libc::{MAP_ANON, MAP_FAILED, MAP_FIXED, MAP_PRIVATE, PROT_NONE, PROT_READ, PROT_WRITE}; |