Move stubs to the global stub_ss[] source set. These files are now built once for all binaries, instead of one time per system binary. Inspired-by: Pierrick Bouvier Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- accel/stubs/meson.build | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index 5de4a279ff9..ccad583e647 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -1,11 +1,10 @@ -system_stubs_ss = ss.source_set() -system_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c')) -system_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c')) -system_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c')) -system_stubs_ss.add(when: 'CONFIG_HVF', if_false: files('hvf-stub.c')) -system_stubs_ss.add(when: 'CONFIG_NITRO', if_false: files('nitro-stub.c')) -system_stubs_ss.add(when: 'CONFIG_NVMM', if_false: files('nvmm-stub.c')) -system_stubs_ss.add(when: 'CONFIG_WHPX', if_false: files('whpx-stub.c')) -system_stubs_ss.add(when: 'CONFIG_MSHV', if_false: files('mshv-stub.c')) - -specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: system_stubs_ss) +stub_ss.add(files( + 'hvf-stub.c', + 'kvm-stub.c', + 'nitro-stub.c', + 'mshv-stub.c', + 'nvmm-stub.c', + 'tcg-stub.c', + 'whpx-stub.c', + 'xen-stub.c', +)) -- 2.53.0