diff options
| author | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-02-12 13:42:32 +0000 |
|---|---|---|
| committer | bjorn3 <17426603+bjorn3@users.noreply.github.com> | 2023-04-13 13:15:36 +0000 |
| commit | 51ac38190f8afa063f2e69d19d78b50b48feac75 (patch) | |
| tree | ca3d4c0845fa0de17e0f0f7193aee6b41c682f31 | |
| parent | 7b83e16d5b61ccec51747e45eb0846acd40b7093 (diff) | |
| download | rust-51ac38190f8afa063f2e69d19d78b50b48feac75.tar.gz rust-51ac38190f8afa063f2e69d19d78b50b48feac75.zip | |
Enable tls test on MSVC Windows
| -rw-r--r-- | example/mini_core.rs | 2 | ||||
| -rw-r--r-- | example/mini_core_hello_world.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/example/mini_core.rs b/example/mini_core.rs index 6ab226b4691..ea97e9f060e 100644 --- a/example/mini_core.rs +++ b/example/mini_core.rs @@ -698,7 +698,7 @@ struct PanicLocation { } #[no_mangle] -#[cfg(not(windows))] +#[cfg(not(all(windows, target_env = "gnu")))] pub fn get_tls() -> u8 { #[thread_local] static A: u8 = 42; diff --git a/example/mini_core_hello_world.rs b/example/mini_core_hello_world.rs index 867e2a14907..3232cd503fc 100644 --- a/example/mini_core_hello_world.rs +++ b/example/mini_core_hello_world.rs @@ -319,7 +319,7 @@ fn main() { from_decimal_string(); - #[cfg(not(any(jit, windows)))] + #[cfg(all(not(jit), not(all(windows, target_env = "gnu"))))] test_tls(); #[cfg(all(not(jit), target_arch = "x86_64", any(target_os = "linux", target_os = "darwin")))] |