[08/10] meson: rename "arch" variable

Commit Message

Paolo Bonzini Dec. 16, 2021, 8:51 a.m. UTC

Avoid confusion between the ARCH variable of configure/config-host.mak
and the same-named variable of meson.build.

Signed-off-by: Paolo Bonzini <[e-mail]>
---
 meson.build | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Philippe Mathieu-Daudé Dec. 16, 2021, 9:10 a.m. UTC | #1

On 12/16/21 09:51, Paolo Bonzini wrote:
> Avoid confusion between the ARCH variable of configure/config-host.mak
> and the same-named variable of meson.build.
> 
> Signed-off-by: Paolo Bonzini <[e-mail]>
> ---
>  meson.build | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>

Richard Henderson Dec. 17, 2021, 9:49 p.m. UTC | #2

On 12/16/21 12:51 AM, Paolo Bonzini wrote:
> Avoid confusion between the ARCH variable of configure/config-host.mak
> and the same-named variable of meson.build.
> 
> Signed-off-by: Paolo Bonzini<[e-mail]>
> ---
>   meson.build | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)

Reviewed-by: Richard Henderson <[e-mail]>

r~

Patch

diff --git a/meson.build b/meson.build
index 903d4f3b10..677ab1b57d 100644
--- a/meson.build
+++ b/meson.build
@@ -2845,7 +2845,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',
@@ -2861,11 +2861,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()
@@ -2876,8 +2876,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
@@ -2915,7 +2915,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()