[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 25/51] configure: move tests/tcg/Makefile.prereqs to root buil
From: |
Alex Bennée |
Subject: |
[PATCH v1 25/51] configure: move tests/tcg/Makefile.prereqs to root build directory |
Date: |
Thu, 29 Sep 2022 12:42:05 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
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>
---
configure | 15 +++++++--------
Makefile | 5 ++++-
tests/Makefile.include | 3 ---
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/configure b/configure
index ceb1213292..cbeac99b2b 100755
--- a/configure
+++ b/configure
@@ -2185,6 +2185,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 --"
@@ -2297,6 +2298,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" && \
@@ -2524,10 +2527,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
@@ -2565,8 +2565,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
@@ -2576,11 +2575,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/Makefile b/Makefile
index 0fcde48bec..357592ad39 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/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.34.1
- [PATCH v1 16/51] build: add recursive distclean rules, (continued)
- [PATCH v1 16/51] build: add recursive distclean rules, Alex Bennée, 2022/09/29
- [PATCH v1 28/51] configure: build ROMs with container-based cross compilers, Alex Bennée, 2022/09/29
- [PATCH v1 09/51] tests/docker: update fedora-win[32|64]-cross with lcitool, Alex Bennée, 2022/09/29
- [PATCH v1 13/51] pc-bios/optionrom: detect CC options just once, Alex Bennée, 2022/09/29
- [PATCH v1 15/51] vof: add distclean target, Alex Bennée, 2022/09/29
- [PATCH v1 19/51] tests: simplify Makefile invocation for tests/tcg, Alex Bennée, 2022/09/29
- [PATCH v1 36/51] plugins: Assert mmu_idx in range before use in qemu_plugin_get_hwaddr, Alex Bennée, 2022/09/29
- [PATCH v1 38/51] docs/devel: move API to end of tcg-plugins.rst, Alex Bennée, 2022/09/29
- [PATCH v1 34/51] disas: use result of ->read_memory_func, Alex Bennée, 2022/09/29
- [PATCH v1 43/51] gdbstub: move sstep flags probing into AccelClass, Alex Bennée, 2022/09/29
- [PATCH v1 25/51] configure: move tests/tcg/Makefile.prereqs to root build directory,
Alex Bennée <=
- [PATCH v1 27/51] configure: cleanup creation of tests/tcg target config, Alex Bennée, 2022/09/29
- [PATCH v1 24/51] tests/tcg: move compiler tests to Makefiles, Alex Bennée, 2022/09/29
- [PATCH v1 29/51] pc-bios/optionrom: Adopt meson style Make output, Alex Bennée, 2022/09/29
- [PATCH v1 17/51] configure: return status code from probe_target_compiler, Alex Bennée, 2022/09/29
- [PATCH v1 21/51] tests/tcg: add distclean rule, Alex Bennée, 2022/09/29
- [PATCH v1 49/51] contrib/gitdm: add WANG Xuerui to individual contributers, Alex Bennée, 2022/09/29
- [PATCH v1 23/51] tests/tcg: clean up calls to run-test, Alex Bennée, 2022/09/29
- [PATCH v1 47/51] contrib/gitdm: add mapping for Loongson Technology, Alex Bennée, 2022/09/29
- [PATCH v1 18/51] configure: store container engine in config-host.mak, Alex Bennée, 2022/09/29
- [PATCH v1 20/51] tests/tcg: remove -f from Makefile invocation, Alex Bennée, 2022/09/29