From: Dylan Baker <dylan@pnwbakers.com>
Date: Tue, 22 May 2018 21:08:36 +0000 (-0700)
Subject: meson: don't define USE_ELF_TLS for windows
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8eee724b7352d066a8ce6f5401ca7ac8c6f778a8;p=mesa.git

meson: don't define USE_ELF_TLS for windows

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>
---

diff --git a/meson.build b/meson.build
index cfa77db1a1a..781a21cf2ee 100644
--- a/meson.build
+++ b/meson.build
@@ -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