From 5d3669b21e467fa37a1ab9774af600635c1cbcac Mon Sep 17 00:00:00 2001 From: Emmanuel Date: Fri, 24 Jan 2020 22:31:47 +0100 Subject: [PATCH] meson: Do not enable USE_ELF_TLS for FreeBSD Compiling with this option result in too much TLS usage and FreeBSD cannot handle that. Reviewed-by: Eric Engestrom Signed-off-by: Emmanuel Part-of: (cherry picked from commit 708db983dd08984b0cade15be576497661ef154c) --- .pick_status.json | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 4c4c216cb39..68c439a335f 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2497,7 +2497,7 @@ "description": "meson: Do not enable USE_ELF_TLS for FreeBSD", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "master_sha": null, "because_sha": null }, diff --git a/meson.build b/meson.build index 97de83796f3..d228de0de55 100644 --- a/meson.build +++ b/meson.build @@ -392,7 +392,7 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat endif # Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS. -if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29) +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' endif