mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure, makefile: remove traces of really old files

Browse Source 
These files have been removed for more than year in the best
case, or for more than ten years for some really old TCG files.
Remove any traces of it.

Acked-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2021-10-13 13:51:32 +02:00
parent b915a2f15c
commit 9da9be2c26
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -206,14 +206,11 @@ recurse-clean: $(addsuffix /clean, $(ROM_DIRS))
clean: recurse-clean clean: recurse-clean
-$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean || : -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean || :
-$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) clean-ctlist || : -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) clean-ctlist || :
# avoid old build problems by removing potentially incorrect old files
rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h gen-op-arm.h
find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \ find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \
! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \
! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \
-exec rm {} + -exec rm {} +
rm -f TAGS cscope.* *.pod *~ */*~ rm -f TAGS cscope.* *~ */*~
rm -f fsdev/*.pod scsi/*.pod
VERSION = $(shell cat $(SRC_PATH)/VERSION) VERSION = $(shell cat $(SRC_PATH)/VERSION)
@ -224,10 +221,10 @@ qemu-%.tar.bz2:
distclean: clean distclean: clean
-$(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 config-host.h* config-poison.h rm -f config-host.mak config-poison.h
rm -f tests/tcg/config-*.mak rm -f tests/tcg/config-*.mak
rm -f config-all-disas.mak config.status rm -f config.status
rm -f roms/seabios/config.mak roms/vgabios/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
rm -f *-config-target.h *-config-devices.mak *-config-devices.h rm -f *-config-target.h *-config-devices.mak *-config-devices.h
rm -rf meson-private meson-logs meson-info compile_commands.json rm -rf meson-private meson-logs meson-info compile_commands.json

9
configure vendored
View File

@ -3672,9 +3672,6 @@ fi
# so the build tree will be missing the link back to the new file, and # so the build tree will be missing the link back to the new file, and
# tests might fail. Prefer to keep the relevant files in their own # tests might fail. Prefer to keep the relevant files in their own
# directory and symlink the directory instead. # directory and symlink the directory instead.
# UNLINK is used to remove symlinks from older development versions
# that might get into the way when doing "git update" without doing
# a "make distclean" in between.
LINKS="Makefile" LINKS="Makefile"
LINKS="$LINKS tests/tcg/Makefile.target" LINKS="$LINKS tests/tcg/Makefile.target"
LINKS="$LINKS pc-bios/optionrom/Makefile" LINKS="$LINKS pc-bios/optionrom/Makefile"
@ -3686,7 +3683,6 @@ LINKS="$LINKS tests/avocado tests/data"
LINKS="$LINKS tests/qemu-iotests/check" LINKS="$LINKS tests/qemu-iotests/check"
LINKS="$LINKS python" LINKS="$LINKS python"
LINKS="$LINKS contrib/plugins/Makefile " LINKS="$LINKS contrib/plugins/Makefile "
UNLINK="pc-bios/keymaps"
for bios_file in \ for bios_file in \
$source_path/pc-bios/*.bin \ $source_path/pc-bios/*.bin \
$source_path/pc-bios/*.elf \ $source_path/pc-bios/*.elf \
@ -3708,11 +3704,6 @@ for f in $LINKS ; do
symlink "$source_path/$f" "$f" symlink "$source_path/$f" "$f"
fi fi
done done
for f in $UNLINK ; do
if [ -L "$f" ]; then
rm -f "$f"
fi
done
(for i in $cross_cc_vars; do (for i in $cross_cc_vars; do
export $i export $i