[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 2/9] configure: remove all dependencies on a (re)configure
From: |
Alex Bennée |
Subject: |
[PULL 2/9] configure: remove all dependencies on a (re)configure |
Date: |
Tue, 14 Jul 2020 10:52:40 +0100 |
The previous code was brittle and missed cases such as the mipn32
variants which for some reason has the 64 bit syscalls. This leads to
a number of binary targets having deps lines like:
all.clang-sanitizer/mipsn32el-linux-user/linux-user/signal.d
140: /home/alex/lsrc/qemu.git/linux-user/mips64/syscall_nr.h \
455:/home/alex/lsrc/qemu.git/linux-user/mips64/syscall_nr.h:
all.clang-sanitizer/mipsn32el-linux-user/linux-user/syscall.d
146: /home/alex/lsrc/qemu.git/linux-user/mips64/syscall_nr.h \
485:/home/alex/lsrc/qemu.git/linux-user/mips64/syscall_nr.h:
which in turn would trigger the re-generation of syscall_nr.h in the
source tree (thanks to generic %/syscall_nr.h rules). The previous
code attempts to clean it out but misses edge cases but fails.
After spending a day trying to understand how this was happening I'm
unconvinced that there are not other such breakages possible with this
"caching". As we add more auto-generated code to the build it is likely
to trip up again. Apply a hammer to the problem.
Fixes: 91e5998f18 (which fixes 5f29856b852d and 4d6a835dea47)
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200713200415.26214-2-alex.bennee@linaro.org>
diff --git a/configure b/configure
index bc3b9ad931..e1de2f5b24 100755
--- a/configure
+++ b/configure
@@ -1955,23 +1955,20 @@ EOF
exit 0
fi
-# Remove old dependency files to make sure that they get properly regenerated
-rm -f */config-devices.mak.d
-
# Remove syscall_nr.h to be sure they will be regenerated in the build
# directory, not in the source directory
for arch in alpha hppa m68k xtensa sh4 microblaze arm ppc s390x sparc sparc64 \
i386 x86_64 mips mips64 ; do
# remove the file if it has been generated in the source directory
rm -f "${source_path}/linux-user/${arch}/syscall_nr.h"
- # remove the dependency files
- for target in ${arch}*-linux-user ; do
- test -d "${target}" && find "${target}" -type f -name "*.d" \
- -exec grep -q "${source_path}/linux-user/${arch}/syscall_nr.h" {}
\; \
- -print | while read file ; do rm "${file}" "${file%.d}.o" ; done
- done
done
+# Clean out all old dependency files. As more files are generated we
+# run the risk of old dependencies triggering generation in the wrong
+# places. Previous brittle attempts to be surgical tend to miss edge
+# cases leading to wasted time and much confusion.
+find -type f -name "*.d" -exec rm -f {} \;
+
if test -z "$python"
then
error_exit "Python not found. Use --python=/path/to/python"
--
2.20.1
- [PULL 0/9] final misc fixes for 5.1-rc0, Alex Bennée, 2020/07/14
- [PULL 1/9] docs/devel: fix grammar in multi-thread-tcg, Alex Bennée, 2020/07/14
- [PULL 2/9] configure: remove all dependencies on a (re)configure,
Alex Bennée <=
- [PULL 3/9] tests/docker: Remove the libssh workaround from the ubuntu 20.04 image, Alex Bennée, 2020/07/14
- [PULL 4/9] docker.py: fix fetching of FROM layers, Alex Bennée, 2020/07/14
- [PULL 6/9] fpu/softfloat: fix up float16 nan recognition, Alex Bennée, 2020/07/14
- [PULL 5/9] gitlab-ci/containers: Add missing wildcard where we should look for changes, Alex Bennée, 2020/07/14
- [PULL 7/9] tests/plugins: don't unconditionally add -Wpsabi, Alex Bennée, 2020/07/14
- [PULL 8/9] cputlb: ensure we save the IOTLB data in case of reset, Alex Bennée, 2020/07/14
- [PULL 9/9] plugins: expand the bb plugin to be thread safe and track per-cpu, Alex Bennée, 2020/07/14
- Re: [PULL 0/9] final misc fixes for 5.1-rc0, Peter Maydell, 2020/07/15