Date: Tue, 10 Sep 2024 17:55:05 GMT From: Jessica Clarke <jrtc27@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 1a5569771980 - main - depend-cleanup.sh: Fix overzealous syscall.S cleanup on non-amd64 Message-ID: <202409101755.48AHt5jl086470@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=1a556977198020da4a2148714bec1d9b68724f99 commit 1a556977198020da4a2148714bec1d9b68724f99 Author: Jessica Clarke <jrtc27@FreeBSD.org> AuthorDate: 2024-09-10 17:54:45 +0000 Commit: Jessica Clarke <jrtc27@FreeBSD.org> CommitDate: 2024-09-10 17:54:45 +0000 depend-cleanup.sh: Fix overzealous syscall.S cleanup on non-amd64 Although there is no longer a syscall.S in the source tree, the generated file is still called syscall.S, so the syscall\.S regex still matches the .depend file. Previously it looked like: syscall.o \ /path/to/src/lib/libc/MACHINE/sys/syscall.S \ ... or syscall.o \ /path/to/src/lib/libsys/MACHINE/syscall.S \ ... Now it looks like: syscall.o: syscall.S \ ... Thus, match on the file having a directory specified, to distinguish it from the generated case where it's adjacent in the OBJDIR. Note the .* is needed due to the use of egrep -w. Fixes: 3a4b04e82df6 ("depend-cleanup.sh: Simplify handling for stale syscall.S") --- tools/build/depend-cleanup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index b3608e46b65d..b1e498b1460e 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -173,8 +173,8 @@ clean_dep lib/libc statfs c # 20240308 0ee0ae237324 Remove pointless MD syscall(2) # 20240308 7b3836c28188 Remove pointless MD syscall(2) if [ ${MACHINE} != i386 ]; then - clean_dep lib/libsys syscall S - clean_dep lib/libc syscall S + clean_dep lib/libsys syscall S ".*/syscall\.S" + clean_dep lib/libc syscall S ".*/syscall\.S" fi # 20240416 2fda3ab0ac19 WITH_NVME: Remove from broken
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409101755.48AHt5jl086470>