Mesa (master): meson: don't build with USE_ELF_TLS on OpenBSD

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Aug 31 09:28:27 UTC 2020


Module: Mesa
Branch: master
Commit: c97af23b13c55c27f5fe381793ee9a3d6f3a2280
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c97af23b13c55c27f5fe381793ee9a3d6f3a2280

Author: Jonathan Gray <jsg at jsg.id.au>
Date:   Fri Dec  6 15:23:36 2019 +1100

meson: don't build with USE_ELF_TLS on OpenBSD

OpenBSD does not have TLS

Fixes: a47c525f328 ("meson: build glx")
Signed-off-by: Jonathan Gray <jsg at jsg.id.au>
Reviewed-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5630>

---

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

diff --git a/meson.build b/meson.build
index 85a724ffc98..edb49e0fe7c 100644
--- a/meson.build
+++ b/meson.build
@@ -428,7 +428,7 @@ 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)
+if not ['windows', 'freebsd', 'openbsd'].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



More information about the mesa-commit mailing list