diff --git meson.build meson.build index 4afd8ca..ab9b365 100644 --- a/meson.build +++ b/meson.build @@ -378,7 +378,8 @@ 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 not with_platform_android or get_option('platform-sdk-version') >= 29 +with_use_elf_tls = get_option('use-elf-tls') +if with_use_elf_tls and not with_platform_android or get_option('platform-sdk-version') >= 29 pre_args += '-DUSE_ELF_TLS' endif diff --git meson_options.txt meson_options.txt index b768c15..2533220 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -358,3 +358,9 @@ option( value : 25, description : 'Android Platform SDK version. Default: Nougat version.' ) +option( + 'use-elf-tls', + type : 'boolean', + value : false, + description : 'Build support for initial-exec TLS model' +)