From c4575b59155e2e0065c29d56496dbf3e6ffd035b Mon Sep 17 00:00:00 2001
From: Paolo Bonzini
Date: Thu, 29 Sep 2022 12:41:58 +0100
Subject: configure: store container engine in config-host.mak

In preparation for removing $(DOCKER_SCRIPT) from the tests/tcg configuration
files, have Make use the same container engine that had been probed at
configure time.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220929114231.583801-19-alex.bennee@linaro.org>
---
 configure | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index a62a833d83..15033a4935 100755
--- a/configure
+++ b/configure
@@ -1779,9 +1779,11 @@ fi
 
 container="no"
 if test $use_containers = "yes"; then
-    if has "docker" || has "podman"; then
-        container=$($python "$source_path"/tests/docker/docker.py probe)
-    fi
+    case $($python "$source_path"/tests/docker/docker.py probe) in
+        *docker) container=docker ;;
+        podman) container=podman ;;
+        no) container=no ;;
+    esac
 fi
 
 # cross compilers defaults, can be overridden with --cross-cc-ARCH
@@ -2373,6 +2375,9 @@ if test -n "$gdb_bin"; then
     fi
 fi
 
+if test "$container" != no; then
+    echo "ENGINE=$container" >> $config_host_mak
+fi
 echo "ROMS=$roms" >> $config_host_mak
 echo "MAKE=$make" >> $config_host_mak
 echo "PYTHON=$python" >> $config_host_mak
-- 
cgit v1.2.3-55-g7522