fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-28 04:20:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

meson: don't advertise TLS support if glx wasn't build with it

Browse source 
Fixes: a47c525f32 ("meson: build glx")
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5630>
This commit is contained in:
Eric Engestrom 2019-11-21 22:14:50 +00:00 • committed by Marge Bot
parent f9a7e6e854
commit 9ac1686422
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

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

2
src/meson.build
View file

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