From 5685dc35f07c90aeb75e77bad9d6d082c0af2be9 Mon Sep 17 00:00:00 2001 From: Olexa Bilaniuk Date: Thu, 28 Oct 2021 12:36:50 -0400 Subject: Revert use of thin archives in 0.60 branch. Some custom_target()s may want to receive "fat" archives, so making use of thin static_library() archives conditional only on it not being installed, and without the possibility of an override by the user, is undesirable. In #9453 I propose adding a thin: kwarg defaulting to true, but that's a new feature that can only land in 0.61. --- mesonbuild/backend/ninjabackend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 37f5259..58e0d66 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -2789,7 +2789,7 @@ https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47485''')) if target.import_filename: commands += linker.gen_import_library_args(self.get_import_filename(target)) elif isinstance(target, build.StaticLibrary): - commands += linker.get_std_link_args(not target.should_install()) + commands += linker.get_std_link_args(False) else: raise RuntimeError('Unknown build target type.') return commands -- cgit v1.1