From 9ef6ff17023dd2d6816eaa9fb1c059a4d97fae17 Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Sun, 13 Oct 2024 01:49:58 -0400 Subject: [PATCH] build: Fix LTO with Android NDK `no-emulated-tls` is passed, but also link arguments are required for LTO. Tested-by: Mauro Rossi Signed-off-by: David Heidelberg Part-of: --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index 43b42c14ce2..0064d36b48e 100644 --- a/meson.build +++ b/meson.build @@ -492,6 +492,7 @@ if with_platform_android and get_option('platform-sdk-version') >= 29 # ELF TLS, even when building targeting newer API levels. Make it actually do # ELF TLS instead. c_cpp_args += '-fno-emulated-tls' + add_project_link_arguments('-Wl,-plugin-opt=-emulated-tls=0', language: ['c', 'cpp']) endif # -mtls-dialect=gnu2 speeds up non-initial-exec TLS significantly but requires