Mesa (main): meson: check -mtls if has_exe_wrapper

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 558bc2227ed00fc6a29c2a10c0b99719cd445c6c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=558bc2227ed00fc6a29c2a10c0b99719cd445c6c

Author: Michel Zou <xantares09 at hotmail.com>
Date:   Mon Dec  6 20:16:19 2021 +0100

meson: check -mtls if has_exe_wrapper

Fixes: 60d95c5d (Auto-enable TLSDESC support)
Reviewed-by: Emma Anholt <emma at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14086>

---

 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 53ec2c2ef95..c987073b537 100644
--- a/meson.build
+++ b/meson.build
@@ -502,7 +502,7 @@ endforeach
 if not have_mtls_dialect
   # need .run to check libc support. meson aborts when calling .run when
   # cross-compiling, but because this is just an optimization we can skip it
-  if meson.is_cross_build()
+  if meson.is_cross_build() and not meson.has_exe_wrapper()
     warning('cannot auto-detect -mtls-dialect when cross-compiling, using compiler default')
   else
     # -fpic to force dynamic tls, otherwise TLS relaxation defeats check