meson: don't define USE_ELF_TLS for windows
authorDylan Baker <dylan@pnwbakers.com>
Tue, 22 May 2018 21:08:36 +0000 (14:08 -0700)
committerDylan Baker <dylan@pnwbakers.com>
Thu, 10 Oct 2019 23:33:04 +0000 (16:33 -0700)
Because the macros for exporting dll symbols and using TLS are mutually
exclusive.

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Acked-by: Kristian H. Kristensen <hoegsberg@google.com>
meson.build

index cfa77db1a1a79adc81081b27fe747a6e758d2eb7..781a21cf2ee13678c727cce053f36ffa43d2575c 100644 (file)
@@ -390,7 +390,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
 endif
 
 # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
-if not with_platform_android or get_option('platform-sdk-version') >= 29
+if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)
   pre_args += '-DUSE_ELF_TLS'
 endif