aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlexa Bilaniuk <obilaniu@gmail.com>2021-10-28 12:36:50 -0400
committerXavier Claessens <xclaesse@gmail.com>2021-10-28 15:33:23 -0400
commit5685dc35f07c90aeb75e77bad9d6d082c0af2be9 (patch)
tree10ed5edd9c077f2dc2562a0d7312be5f34e35008
parentbc102e6325cdc10dcedcd4f7f25a40e72f581dcd (diff)
downloadmeson-0.60.zip
meson-0.60.tar.gz
meson-0.60.tar.bz2
Revert use of thin archives in 0.60 branch.0.60
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.
-rw-r--r--mesonbuild/backend/ninjabackend.py2
1 files changed, 1 insertions, 1 deletions
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