diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2019-11-21 22:14:50 +0000 |
|---|---|---|
| committer | Dylan Baker <dylan.c.baker@intel.com> | 2020-09-01 13:53:29 -0700 |
| commit | fe8d18e75254e7d1c91578ace6a34627ff636ed9 (patch) | |
| tree | 5556b6e3d27a1892302c4149554467076364c182 | |
| parent | 8f4094bb1c4d178df8ca13db828c76074d42d3ce (diff) | |
meson: don't advertise TLS support if glx wasn't build with it
Fixes: a47c525f328 ("meson: build glx")
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5630>
(cherry picked from commit 9ac16864227cc63ca6b23eeab39fdcc7f85beca5)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/meson.build | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index b136d4924ab..6ed95504169 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -922,7 +922,7 @@ "description": "meson: don't advertise TLS support if glx wasn't build with it", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "a47c525f3281a2753180e076c7e9b7772aff8f06" }, diff --git a/meson.build b/meson.build index 4ee86381bbb..57fb03bd15c 100644 --- a/meson.build +++ b/meson.build @@ -423,8 +423,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 b16717193e9..3859ea1bf69 100644 --- a/src/meson.build +++ b/src/meson.build @@ -123,6 +123,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 |