2019-09-02 16:03:02 +00:00
|
|
|
diff --git a/meson.build b/meson.build
|
2019-12-23 18:38:56 +00:00
|
|
|
index 898d025..0da4fc5 100644
|
2019-09-02 16:03:02 +00:00
|
|
|
--- a/meson.build
|
|
|
|
|
+++ b/meson.build
|
2019-12-23 18:38:56 +00:00
|
|
|
@@ -387,7 +387,8 @@ if with_egl and not (with_platform_drm or with_platform_surfaceless or with_plat
|
2019-09-02 16:03:02 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
|
2019-10-28 00:15:12 +00:00
|
|
|
-if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)
|
2019-12-23 18:38:56 +00:00
|
|
|
+with_use_elf_tls = get_option('use-elf-tls')
|
|
|
|
|
+if with_use_elf_tls and host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)
|
|
|
|
|
pre_args += '-DUSE_ELF_TLS'
|
2019-09-02 16:03:02 +00:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
2019-12-23 18:38:56 +00:00
|
|
|
index 626baf3..6e4637c 100644
|
2019-09-02 16:03:02 +00:00
|
|
|
--- a/meson_options.txt
|
|
|
|
|
+++ b/meson_options.txt
|
2019-12-23 18:38:56 +00:00
|
|
|
@@ -366,3 +366,9 @@ option(
|
|
|
|
|
value : 25,
|
|
|
|
|
description : 'Android Platform SDK version. Default: Nougat version.'
|
2019-09-02 16:03:02 +00:00
|
|
|
)
|
|
|
|
|
+option(
|
|
|
|
|
+ 'use-elf-tls',
|
|
|
|
|
+ type : 'boolean',
|
2019-12-23 18:38:56 +00:00
|
|
|
+ value : false,
|
|
|
|
|
+ description : 'Build support for initial-exec TLS model'
|
2019-09-02 16:03:02 +00:00
|
|
|
+)
|
