tests/tcg: Use $cpu in configure.sh

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: 823eb01345 ("configure, meson: move ARCH to meson.build")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson 2021-12-24 12:08:18 -08:00
parent 0e3ed77de5
commit fd0f79d715
2 changed files with 2 additions and 2 deletions

2
configure vendored
View File

@ -3821,7 +3821,7 @@ done
(for i in $cross_cc_vars; do (for i in $cross_cc_vars; do
export $i export $i
done done
export target_list source_path use_containers ARCH export target_list source_path use_containers cpu
$source_path/tests/tcg/configure.sh) $source_path/tests/tcg/configure.sh)
# temporary config to build submodules # temporary config to build submodules

View File

@ -326,7 +326,7 @@ for target in $target_list; do
elif test $got_cross_cc = no && test "$container" != no && \ elif test $got_cross_cc = no && test "$container" != no && \
test -n "$container_image"; then test -n "$container_image"; then
for host in $container_hosts; do 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_IMAGE=$container_image" >> $config_target_mak
echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> \ echo "DOCKER_CROSS_CC_GUEST=$container_cross_cc" >> \
$config_target_mak $config_target_mak