OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

configure: cleanup creation of tests/tcg target config

Browse Source 
Remove the symlink to tests/tcg/config-*.mak, which is possible now
that unused target config files are not created either.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20220929114231.583801-28-alex.bennee@linaro.org>
This commit is contained in:
Paolo Bonzini 2022-09-29 12:42:07 +01:00 committed by Alex Bennée
parent 0825cae023
commit c7022a703c
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -221,7 +221,7 @@ qemu-%.tar.bz2:
distclean: clean recurse-distclean distclean: clean recurse-distclean
-$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || : -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || :
rm -f config-host.mak Makefile.prereqs qemu-bundle rm -f config-host.mak Makefile.prereqs qemu-bundle
rm -f tests/tcg/config-*.mak rm -f tests/tcg/*/config-target.mak tests/tcg/config-host.mak
rm -f config.status rm -f config.status
rm -f roms/seabios/config.mak rm -f roms/seabios/config.mak
rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols

12
configure vendored
View File

@ -2468,10 +2468,6 @@ tcg_tests_targets=
for target in $target_list; do for target in $target_list; do
arch=${target%%-*} arch=${target%%-*}
config_target_mak=tests/tcg/config-$target.mak
echo "# Automatically generated by configure - do not modify" > $config_target_mak
echo "TARGET_NAME=$arch" >> "$config_target_mak"
case $target in case $target in
xtensa*-linux-user) xtensa*-linux-user)
# the toolchain is not complete with headers, only build softmmu tests # the toolchain is not complete with headers, only build softmmu tests
@ -2488,13 +2484,15 @@ for target in $target_list; do
if probe_target_compiler $target || test -n "$container_image"; then if probe_target_compiler $target || test -n "$container_image"; then
test -n "$container_image" && build_static=y test -n "$container_image" && build_static=y
write_target_makefile "build-tcg-tests-$target >> "$config_target_mak"
mkdir -p "tests/tcg/$target" mkdir -p "tests/tcg/$target"
config_target_mak=tests/tcg/$target/config-target.mak
ln -sf "$source_path/tests/tcg/Makefile.target" "tests/tcg/$target/Makefile" ln -sf "$source_path/tests/tcg/Makefile.target" "tests/tcg/$target/Makefile"
ln -sf "../config-$target.mak" "tests/tcg/$target/config-target.mak" echo "# Automatically generated by configure - do not modify" > "$config_target_mak"
echo "TARGET_NAME=$arch" >> "$config_target_mak"
echo "TARGET=$target" >> "$config_target_mak" echo "TARGET=$target" >> "$config_target_mak"
echo "QEMU=$PWD/$qemu" >> "$config_target_mak" write_target_makefile "build-tcg-tests-$target" >> "$config_target_mak"
echo "BUILD_STATIC=$build_static" >> "$config_target_mak" echo "BUILD_STATIC=$build_static" >> "$config_target_mak"
echo "QEMU=$PWD/$qemu" >> "$config_target_mak"
echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs echo "run-tcg-tests-$target: $qemu\$(EXESUF)" >> Makefile.prereqs
tcg_tests_targets="$tcg_tests_targets $target" tcg_tests_targets="$tcg_tests_targets $target"
fi fi

2
meson.build
View File

@ -3764,7 +3764,7 @@ summary(summary_info, bool_yn: true, section: 'Compilation')
summary_info = {} summary_info = {}
have_cross = false have_cross = false
foreach target: target_dirs foreach target: target_dirs
tcg_mak = meson.current_build_dir() / 'tests/tcg' / 'config-' + target + '.mak' tcg_mak = meson.current_build_dir() / 'tests/tcg' / target / 'config-target.mak'
if fs.exists(tcg_mak) if fs.exists(tcg_mak)
config_cross_tcg = keyval.load(tcg_mak) config_cross_tcg = keyval.load(tcg_mak)
if 'CC' in config_cross_tcg if 'CC' in config_cross_tcg