summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2018-04-04 14:24:39 +0100
committerAlex Bennée <alex.bennee@linaro.org>2018-06-05 16:25:42 +0100
commit51a12b51fd3693a16eb73362713a98d467e15af7 (patch)
tree079988f73560bc62402cde0fbba5dfd3dba90cd1 /configure
parent15df9d3783d80f64be3149b9120b6a086bdc210a (diff)
configure: add test for docker availability
This tests for a working docker installation without sudo and sets up config-host.mak accordingly. This will be useful from cross compiling things in the future. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure17
1 files changed, 17 insertions, 0 deletions
diff --git a/configure b/configure
index ab810d728f..db8c9d8288 100755
--- a/configure
+++ b/configure
@@ -456,6 +456,7 @@ jemalloc="no"
replication="yes"
vxhs=""
libxml2=""
+docker="no"
supported_cpu="no"
supported_os="no"
@@ -5451,6 +5452,17 @@ EOF
fi
##########################################
+# Docker and cross-compiler support
+#
+# This is specifically for building test
+# cases for foreign architectures, not
+# cross-compiling QEMU itself.
+
+if has "docker"; then
+ docker=$($python $source_path/tests/docker/docker.py probe)
+fi
+
+##########################################
# End of CC checks
# After here, no more $cc or $ld runs
@@ -5913,6 +5925,7 @@ echo "avx2 optimization $avx2_opt"
echo "replication support $replication"
echo "VxHS block device $vxhs"
echo "capstone $capstone"
+echo "docker $docker"
if test "$sdl_too_old" = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -6740,6 +6753,10 @@ if test "$gcov" = "yes" ; then
echo "GCOV=$gcov_tool" >> $config_host_mak
fi
+if test "$docker" != "no"; then
+ echo "HAVE_USER_DOCKER=y" >> $config_host_mak
+fi
+
# use included Linux headers
if test "$linux" = "yes" ; then
mkdir -p linux-headers