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 <[email protected]> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> --- meson.build | 2 +- accel/stubs/meson.build | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index db051a1b87b..5fecd6103a6 100644 --- a/meson.build +++ b/meson.build @@ -3731,6 +3731,7 @@ subdir('io') subdir('chardev') subdir('fsdev') subdir('dump') +subdir('accel') if have_system subdir('hw') @@ -3849,7 +3850,6 @@ subdir('replay') subdir('stats') subdir('tcg') subdir('fpu') -subdir('accel') subdir('plugins') subdir('ebpf') diff --git a/accel/stubs/meson.build b/accel/stubs/meson.build index 48eccd1b861..fd5b8b0da5a 100644 --- a/accel/stubs/meson.build +++ b/accel/stubs/meson.build @@ -1,10 +1,9 @@ -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_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', + 'mshv-stub.c', + 'nvmm-stub.c', + 'tcg-stub.c', + 'whpx-stub.c', + 'xen-stub.c', +)) -- 2.52.0
