From 9ac16864227cc63ca6b23eeab39fdcc7f85beca5 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 21 Nov 2019 22:14:50 +0000 Subject: [PATCH] meson: don't advertise TLS support if glx wasn't build with it Fixes: a47c525f328 ("meson: build glx") Signed-off-by: Eric Engestrom Part-of: --- meson.build | 2 ++ src/meson.build | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 661a01e82b4..85a724ffc98 100644 --- a/meson.build +++ b/meson.build @@ -427,8 +427,10 @@ else endif # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. +use_elf_tls = false if not ['windows', 'freebsd'].contains(host_machine.system()) and (not with_platform_android or get_option('platform-sdk-version') >= 29) pre_args += '-DUSE_ELF_TLS' + use_elf_tls = true endif if with_glx != 'disabled' diff --git a/src/meson.build b/src/meson.build index 1d8e7633369..ed0a3091d6d 100644 --- a/src/meson.build +++ b/src/meson.build @@ -126,6 +126,6 @@ if with_glx != 'disabled' and not with_glvnd libraries : libgl, libraries_private : gl_priv_libs, requires_private : gl_priv_reqs, - variables : ['glx_tls=yes'], + variables : ['glx_tls=@0@'.format(use_elf_tls ? 'yes' : 'no')], ) endif -- 2.30.2