[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/5] tests/tcg: Use $cpu in configure.sh
From: |
Richard Henderson |
Subject: |
[PULL 2/5] tests/tcg: Use $cpu in configure.sh |
Date: |
Mon, 3 Jan 2022 09:33:23 -0800 |
Use $cpu instead of $ARCH, which has been removed from
the top-level configure.
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Fixes: 823eb013452e ("configure, meson: move ARCH to meson.build")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
configure | 2 +-
tests/tcg/configure.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index eb977e5b6f..030728d11e 100755
--- a/configure
+++ b/configure
@@ -3821,7 +3821,7 @@ done
(for i in $cross_cc_vars; do
export $i
done
-export target_list source_path use_containers ARCH
+export target_list source_path use_containers cpu
$source_path/tests/tcg/configure.sh)
# temporary config to build submodules
diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
index 9ef913df5b..8eb4287c84 100755
--- a/tests/tcg/configure.sh
+++ b/tests/tcg/configure.sh
@@ -326,7 +326,7 @@ for target in $target_list; do
elif test $got_cross_cc = no && test "$container" != no && \
test -n "$container_image"; then
for host in $container_hosts; do
- if test "$host" = "$ARCH"; then
+ if test "$host" = "$cpu"; then
echo "DOCKER_IMAGE=$container_image" >> $config_target_mak
echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> \
$config_target_mak
--
2.25.1
- [PULL 0/5] Misc patch queue, Richard Henderson, 2022/01/03
- [PULL 1/5] meson: Unify mips and mips64 in host_arch, Richard Henderson, 2022/01/03
- [PULL 3/5] tests/tcg: Unconditionally use 90 second timeout, Richard Henderson, 2022/01/03
- [PULL 4/5] target/hppa: Fix atomic_store_3 for STBY, Richard Henderson, 2022/01/03
- [PULL 5/5] gitlab: Disable check-python-tox, Richard Henderson, 2022/01/03
- [PULL 2/5] tests/tcg: Use $cpu in configure.sh,
Richard Henderson <=
- Re: [PULL 0/5] Misc patch queue, Richard Henderson, 2022/01/03