Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Aug 2024 19:49:27 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 3a4b04e82df6 - main - depend-cleanup.sh: Simplify handling for stale syscall.S
Message-ID:  <202408051949.475JnRAM055960@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=3a4b04e82df6bb9b28aa0c3c670c19063843d644

commit 3a4b04e82df6bb9b28aa0c3c670c19063843d644
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2024-08-05 19:49:06 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2024-08-05 19:49:06 +0000

    depend-cleanup.sh: Simplify handling for stale syscall.S
    
    Remove the outer grep and depend on the greps in clean_dep instead.
    
    Reviewed by:    brooks, imp
    Obtained from:  CheriBSD
    Sponsored by:   AFRL, DARPA
    Differential Revision:  https://reviews.freebsd.org/D46103
---
 tools/build/depend-cleanup.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index b93d50a57ff4..b7231422c5ed 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -171,9 +171,7 @@ clean_dep   lib/libc        statfs        c
 # 20240308  e6ffc7669a56    Remove pointless MD syscall(2)
 # 20240308  0ee0ae237324    Remove pointless MD syscall(2)
 # 20240308  7b3836c28188    Remove pointless MD syscall(2)
-if [ ${MACHINE} != i386 -a -f "$OBJTOP"/lib/libsys/.depend.syscall.o ] && \
-    grep -q -e 'libsys/[^ /]*/syscall.S' "$OBJTOP"/lib/libsys/.depend.syscall.*; then
-	echo "Removing stale <arch>/syscall.S depends"
+if [ ${MACHINE} != i386 ]; then
 	clean_dep   lib/libsys  syscall S
 	clean_dep   lib/libc    syscall S
 fi



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408051949.475JnRAM055960>