[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/16] meson: rename "arch" variable
From: |
Paolo Bonzini |
Subject: |
[PULL 06/16] meson: rename "arch" variable |
Date: |
Sun, 19 Dec 2021 15:17:01 +0100 |
Avoid confusion between the ARCH variable of configure/config-host.mak
and the same-named variable of meson.build.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/meson.build b/meson.build
index 69cca2aa9f..4fdaa65b05 100644
--- a/meson.build
+++ b/meson.build
@@ -2850,7 +2850,7 @@ emulators = {}
foreach target : target_dirs
config_target = config_target_mak[target]
target_name = config_target['TARGET_NAME']
- arch = config_target['TARGET_BASE_ARCH']
+ target_base_arch = config_target['TARGET_BASE_ARCH']
arch_srcs = [config_target_h[target]]
arch_deps = []
c_args = ['-DNEED_CPU_H',
@@ -2866,11 +2866,11 @@ foreach target : target_dirs
if target.endswith('-softmmu')
qemu_target_name = 'qemu-system-' + target_name
target_type='system'
- t = target_softmmu_arch[arch].apply(config_target, strict: false)
+ t = target_softmmu_arch[target_base_arch].apply(config_target, strict:
false)
arch_srcs += t.sources()
arch_deps += t.dependencies()
- hw_dir = target_name == 'sparc64' ? 'sparc64' : arch
+ hw_dir = target_name == 'sparc64' ? 'sparc64' : target_base_arch
hw = hw_arch[hw_dir].apply(config_target, strict: false)
arch_srcs += hw.sources()
arch_deps += hw.dependencies()
@@ -2881,8 +2881,8 @@ foreach target : target_dirs
abi = config_target['TARGET_ABI_DIR']
target_type='user'
qemu_target_name = 'qemu-' + target_name
- if arch in target_user_arch
- t = target_user_arch[arch].apply(config_target, strict: false)
+ if target_base_arch in target_user_arch
+ t = target_user_arch[target_base_arch].apply(config_target, strict:
false)
arch_srcs += t.sources()
arch_deps += t.dependencies()
endif
@@ -2920,7 +2920,7 @@ foreach target : target_dirs
arch_srcs += gdbstub_xml
endif
- t = target_arch[arch].apply(config_target, strict: false)
+ t = target_arch[target_base_arch].apply(config_target, strict: false)
arch_srcs += t.sources()
arch_deps += t.dependencies()
--
2.33.1
- [PULL 00/16] Misc patches for 2021-12-20, Paolo Bonzini, 2021/12/19
- [PULL 01/16] configure: make $targetos lowercase, use windows instead of MINGW32, Paolo Bonzini, 2021/12/19
- [PULL 03/16] configure: unify two case statements on $cpu, Paolo Bonzini, 2021/12/19
- [PULL 04/16] configure: unify ppc64 and ppc64le, Paolo Bonzini, 2021/12/19
- [PULL 02/16] configure: move target detection before CPU detection, Paolo Bonzini, 2021/12/19
- [PULL 05/16] configure: unify x86_64 and x32, Paolo Bonzini, 2021/12/19
- [PULL 06/16] meson: rename "arch" variable,
Paolo Bonzini <=
- [PULL 07/16] configure, meson: move ARCH to meson.build, Paolo Bonzini, 2021/12/19
- [PULL 08/16] configure: remove unnecessary symlinks, Paolo Bonzini, 2021/12/19
- [PULL 10/16] meson: reenable test-fdmon-epoll, Paolo Bonzini, 2021/12/19
- [PULL 11/16] cpu: remove unnecessary #ifdef CONFIG_TCG, Paolo Bonzini, 2021/12/19
- [PULL 09/16] configure: remove DIRS, Paolo Bonzini, 2021/12/19
- [PULL 12/16] meson: add "check" argument to run_command, Paolo Bonzini, 2021/12/19
- [PULL 13/16] hw/scsi: Fix scsi_bus_init_named() docstring, Paolo Bonzini, 2021/12/19
- [PULL 14/16] hw/scsi/megasas: Fails command if SGL buffer overflows, Paolo Bonzini, 2021/12/19
- [PULL 15/16] tests/qtest/fuzz-megasas-test: Add test for GitLab issue #521, Paolo Bonzini, 2021/12/19