git: b9c5eab0f307 - main - depend-cleanup.sh: Fix overzealous syscall.S cleanup on amd64

From: Jessica Clarke <jrtc27_at_FreeBSD.org>
Date: Tue, 10 Sep 2024 17:55:06 UTC
The branch main has been updated by jrtc27:

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

commit b9c5eab0f307d43d37efc41109e52098d5a0f7bd
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 amd64
    
    Just as we skip the cleanup for i386 due to still having a custom
    syscall.S, we also need to do the same for lib32 on amd64, so filter it
    out of ALL_libcompats here.
    
    Fixes:  a650ec0e55a9 ("lib{c,sys}: fix incremental builds")
---
 tools/build/depend-cleanup.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index b1e498b1460e..578393e837d2 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -173,8 +173,15 @@ 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 ".*/syscall\.S"
-	clean_dep   lib/libc    syscall S ".*/syscall\.S"
+	libcompats=
+	for libcompat in $ALL_libcompats; do
+		if [ $MACHINE = amd64 ] && [ $libcompat = 32 ]; then
+			continue
+		fi
+		libcompats="${libcompats+$libcompats }$libcompat"
+	done
+	ALL_libcompats="$libcompats" clean_dep   lib/libsys  syscall S ".*/syscall\.S"
+	ALL_libcompats="$libcompats" clean_dep   lib/libc    syscall S ".*/syscall\.S"
 fi
 
 # 20240416  2fda3ab0ac19    WITH_NVME: Remove from broken