diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-12-24 12:08:18 -0800 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-12-30 21:37:35 -0800 |
| commit | fd0f79d715420eb3eac1de738983046cefc5df7d (patch) | |
| tree | dd9de065070d172323bf12694f1c54caee8e19b5 | |
| parent | 0e3ed77de51fab46d1ade0bee102e68fa376fbd8 (diff) | |
| download | focaccia-qemu-fd0f79d715420eb3eac1de738983046cefc5df7d.tar.gz focaccia-qemu-fd0f79d715420eb3eac1de738983046cefc5df7d.zip | |
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: 823eb013452e ("configure, meson: move ARCH to meson.build")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rwxr-xr-x | configure | 2 | ||||
| -rwxr-xr-x | 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 |