From 53e8868d69c195b6b57ccc6847057043c26df1b6 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 26 May 2023 12:20:39 +0200 Subject: meson: remove OS definitions from config_targetos CONFIG_DARWIN, CONFIG_LINUX and CONFIG_BSD are used in some rules, but only CONFIG_LINUX has substantial use. Convert them all to if...endif. Signed-off-by: Paolo Bonzini --- hw/ppc/meson.build | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'hw/ppc') diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index ea44856..3dedcf3 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -34,9 +34,11 @@ ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_TCG'], if_true: files( 'spapr_softmmu.c', )) ppc_ss.add(when: 'CONFIG_SPAPR_RNG', if_true: files('spapr_rng.c')) -ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_LINUX'], if_true: files( - 'spapr_pci_vfio.c', -)) +if targetos == 'linux' + ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files( + 'spapr_pci_vfio.c', + )) +endif # IBM PowerNV ppc_ss.add(when: 'CONFIG_POWERNV', if_true: files( -- cgit v1.1 From d0cda6f461fd33c5f9b063781c63c1ce5fd3fa3b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Fri, 3 Nov 2023 09:17:48 +0100 Subject: configure, meson: rename targetos to host_os This variable is about the host OS, not the target. It is used a lot more since the Meson conversion, but the original sin dates back to 2003. Time to fix it. Signed-off-by: Paolo Bonzini --- hw/ppc/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hw/ppc') diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index 3dedcf3..eba3406 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -34,7 +34,7 @@ ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_TCG'], if_true: files( 'spapr_softmmu.c', )) ppc_ss.add(when: 'CONFIG_SPAPR_RNG', if_true: files('spapr_rng.c')) -if targetos == 'linux' +if host_os == 'linux' ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files( 'spapr_pci_vfio.c', )) -- cgit v1.1