summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPaolo Bonzini2022-09-29 13:42:05 +0200
committerAlex Bennée2022-10-06 12:53:40 +0200
commitb898bf28469847cbe4e576000e83ec103bf9b174 (patch)
treed1135850001d72b19f737d0193f4d0b3bec8f026 /configure
parenttests/tcg: move compiler tests to Makefiles (diff)
downloadqemu-b898bf28469847cbe4e576000e83ec103bf9b174.tar.gz
qemu-b898bf28469847cbe4e576000e83ec103bf9b174.tar.xz
qemu-b898bf28469847cbe4e576000e83ec103bf9b174.zip
configure: move tests/tcg/Makefile.prereqs to root build directory
It will not be specific to tests/tcg anymore, since it will be possible to build firmware using container-based cross compilers too. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20220929114231.583801-26-alex.bennee@linaro.org>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure15
1 files changed, 7 insertions, 8 deletions
diff --git a/configure b/configure
index 0255b127f5..a71e38d20a 100755
--- a/configure
+++ b/configure
@@ -2154,6 +2154,7 @@ write_target_makefile() {
}
write_container_target_makefile() {
+ echo "$1: docker-image-$container_image" >> Makefile.prereqs
echo "EXTRA_CFLAGS=$target_cflags"
if test -n "$container_cross_cc"; then
echo "CC=$docker_py cc --cc $container_cross_cc -i qemu/$container_image -s $source_path --"
@@ -2258,6 +2259,8 @@ for f in $LINKS ; do
fi
done
+echo "# Automatically generated by configure - do not modify" > Makefile.prereqs
+
# Mac OS X ships with a broken assembler
roms=
if test "$targetos" != "darwin" && test "$targetos" != "sunos" && \
@@ -2452,10 +2455,7 @@ if test "$safe_stack" = "yes"; then
fi
# tests/tcg configuration
-(makefile=tests/tcg/Makefile.prereqs
-echo "# Automatically generated by configure - do not modify" > $makefile
-
-config_host_mak=tests/tcg/config-host.mak
+(config_host_mak=tests/tcg/config-host.mak
mkdir -p tests/tcg
echo "# Automatically generated by configure - do not modify" > $config_host_mak
echo "SRC_PATH=$source_path" >> $config_host_mak
@@ -2493,8 +2493,7 @@ for target in $target_list; do
write_target_makefile >> "$config_target_mak"
elif test -n "$container_image"; then
build_static=y
- echo "build-tcg-tests-$target: docker-image-$container_image" >> $makefile
- write_container_target_makefile >> "$config_target_mak"
+ write_container_target_makefile build-tcg-tests-$target >> "$config_target_mak"
got_cross_cc=yes
fi
if test $got_cross_cc = yes; then
@@ -2504,11 +2503,11 @@ for target in $target_list; do
echo "TARGET=$target" >> "$config_target_mak"
echo "QEMU=$PWD/$qemu" >> "$config_target_mak"
echo "BUILD_STATIC=$build_static" >> "$config_target_mak"
- echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> $makefile
+ echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs
tcg_tests_targets="$tcg_tests_targets $target"
fi
done
-echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> $makefile)
+echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> config-host.mak)
if test "$skip_meson" = no; then
cross="config-meson.cross.new"