]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
meson: concatenate donors specified in 'objects'
authorZbigniew Jędrzejewski-Szmek <zbyszek@amutable.com>
Wed, 22 Apr 2026 15:01:45 +0000 (17:01 +0200)
committerLuca Boccassi <luca.boccassi@gmail.com>
Fri, 22 May 2026 12:57:29 +0000 (13:57 +0100)
Previously, we'd only honour the last donor.

(cherry picked from commit 079361e8f0ad1deb711e377472ce2fcaa210bb56)

meson.build

index 646c0ed5217c524904d68e88afbad12e5283af59..841ade0c8b1dbb8d6c67938556d867174fdeb0ec 100644 (file)
@@ -2509,7 +2509,7 @@ foreach dict : executables
 
         foreach val : dict.get('objects', [])
                 obj = objects_by_name[val]
-                kwargs += { 'objects' : obj['objects'] }
+                kwargs += { 'objects' : kwargs.get('objects', []) + obj['objects'] }
                 include_directories += obj['include_directories']
         endforeach