diff options
| author | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2023-03-31 09:37:39 +0200 |
|---|---|---|
| committer | John Kåre Alsaker <john.kare.alsaker@gmail.com> | 2023-03-31 09:37:39 +0200 |
| commit | 6c941362c9814bc5d2c9c436830543ce37e694b6 (patch) | |
| tree | 9b171e3cf8c4e8d6fbad0719a5d1d1de870eca6a | |
| parent | 276029deae08ad5b62f7d1ef2ea1acb7f5f529d8 (diff) | |
| download | rust-6c941362c9814bc5d2c9c436830543ce37e694b6.tar.gz rust-6c941362c9814bc5d2c9c436830543ce37e694b6.zip | |
Workaround #109797 on windows-gnu
| -rw-r--r-- | library/std/src/sys/common/thread_local/os_local.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/library/std/src/sys/common/thread_local/os_local.rs b/library/std/src/sys/common/thread_local/os_local.rs index ce74ad3486e..1442a397e76 100644 --- a/library/std/src/sys/common/thread_local/os_local.rs +++ b/library/std/src/sys/common/thread_local/os_local.rs @@ -49,7 +49,9 @@ macro_rules! __thread_local_inner { #[inline] fn __init() -> $t { $init } - #[cfg_attr(not(bootstrap), inline)] + // `#[inline] does not work on windows-gnu due to linking errors around dllimports. + // See https://github.com/rust-lang/rust/issues/109797. + #[cfg_attr(not(windows), inline)] unsafe fn __getit( init: $crate::option::Option<&mut $crate::option::Option<$t>>, ) -> $crate::option::Option<&'static $t> { |