diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2025-04-05 13:18:13 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-05 13:18:13 +1100 |
| commit | 92bb7261c48b96c49c97b4e83fc311e42280e7cb (patch) | |
| tree | 4d5f2eb18930dbe2354dbaf05eefb4b20ced9784 /library/std/src/sys | |
| parent | c6bf3a01efd2ba8720cede198d3e9b9eadfc712c (diff) | |
| parent | e41cce03a00d29d56f0bb74fb0d5d3e69ee7dfc8 (diff) | |
| download | rust-92bb7261c48b96c49c97b4e83fc311e42280e7cb.tar.gz rust-92bb7261c48b96c49c97b4e83fc311e42280e7cb.zip | |
Rollup merge of #137897 - xTachyon:tls-fix, r=thomcc,jieyouxu
fix pthread-based tls on apple targets Tries to fix #127773.
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/thread_local/mod.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/library/std/src/sys/thread_local/mod.rs b/library/std/src/sys/thread_local/mod.rs index 1ff13154b7b..b7ce6fcdc05 100644 --- a/library/std/src/sys/thread_local/mod.rs +++ b/library/std/src/sys/thread_local/mod.rs @@ -138,6 +138,7 @@ pub(crate) mod key { not(target_family = "wasm"), target_family = "unix", ), + all(not(target_thread_local), target_vendor = "apple"), target_os = "teeos", all(target_os = "wasi", target_env = "p1", target_feature = "atomics"), ))] { |