[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 14/20] configure: move tests/tcg/Makefile.prereqs to root build d
From: |
Paolo Bonzini |
Subject: |
[PATCH 14/20] configure: move tests/tcg/Makefile.prereqs to root build directory |
Date: |
Fri, 26 Aug 2022 00:27:39 +0200 |
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>
---
Makefile | 5 ++++-
configure | 15 +++++++--------
tests/Makefile.include | 3 ---
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index ef0fbb4dee..6fd5b6ac06 100644
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,9 @@ configure: ;
ifneq ($(wildcard config-host.mak),)
include config-host.mak
+include Makefile.prereqs
+Makefile.prereqs: config-host.mak
+
git-submodule-update:
.git-submodule-status: git-submodule-update config-host.mak
Makefile: .git-submodule-status
@@ -217,7 +220,7 @@ qemu-%.tar.bz2:
distclean: clean recurse-distclean
-$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g ||
:
- rm -f config-host.mak qemu-bundle
+ rm -f config-host.mak Makefile.prereqs qemu-bundle
rm -f tests/tcg/config-*.mak
rm -f config.status
rm -f roms/seabios/config.mak
diff --git a/configure b/configure
index 8d61863432..6dc6a5a48b 100755
--- a/configure
+++ b/configure
@@ -2219,6 +2219,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 --"
@@ -2331,6 +2332,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" && \
@@ -2556,10 +2559,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
@@ -2592,8 +2592,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
@@ -2603,11 +2602,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"
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 9ed67721e2..9422ddaece 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -36,9 +36,6 @@ export SRC_PATH
SPEED = quick
--include tests/tcg/Makefile.prereqs
-tests/tcg/Makefile.prereqs: config-host.mak
-
# Per guest TCG tests
BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TCG_TESTS_TARGETS))
CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TCG_TESTS_TARGETS))
--
2.37.1
- [PATCH 02/20] pc-bios/optionrom: detect CC options just once, (continued)
- [PATCH 02/20] pc-bios/optionrom: detect CC options just once, Paolo Bonzini, 2022/08/25
- [PATCH 06/20] configure: return status code from probe_target_compiler, Paolo Bonzini, 2022/08/25
- [PATCH 04/20] vof: add distclean target, Paolo Bonzini, 2022/08/25
- [PATCH 07/20] configure: store container engine in config-host.mak, Paolo Bonzini, 2022/08/25
- [PATCH 08/20] tests: simplify Makefile invocation for tests/tcg, Paolo Bonzini, 2022/08/25
- [PATCH 09/20] tests/tcg: remove -f from Makefile invocation, Paolo Bonzini, 2022/08/25
- [PATCH 10/20] tests/tcg: add distclean rule, Paolo Bonzini, 2022/08/25
- [PATCH 11/20] tests/tcg: unify ppc64 and ppc64le Makefiles, Paolo Bonzini, 2022/08/25
- [PATCH 12/20] tests/tcg: clean up calls to run-test, Paolo Bonzini, 2022/08/25
- [PATCH 13/20] tests/tcg: move compiler tests to Makefiles, Paolo Bonzini, 2022/08/25
- [PATCH 14/20] configure: move tests/tcg/Makefile.prereqs to root build directory,
Paolo Bonzini <=
- [PATCH 15/20] configure: unify creation of cross-compilation Makefiles, Paolo Bonzini, 2022/08/25
- [PATCH 17/20] configure: build ROMs with container-based cross compilers, Paolo Bonzini, 2022/08/25
- [PATCH 18/20] pc-bios/optionrom: Adopt meson style Make output, Paolo Bonzini, 2022/08/25
- [PATCH 16/20] configure: cleanup creation of tests/tcg target config, Paolo Bonzini, 2022/08/25
- [PATCH 19/20] pc-bios/s390-ccw: Adopt meson style Make output, Paolo Bonzini, 2022/08/25
- [PATCH 20/20] pc-bios/vof: Adopt meson style Make output, Paolo Bonzini, 2022/08/25