The branch main has been updated by jrtc27:
URL:
https://cgit.FreeBSD.org/src/commit/?id=cc30f4ae6790cf4f19bc4787d7528dfea79ef27a
commit cc30f4ae6790cf4f19bc4787d7528dfea79ef27a
Author: Jessica Clarke <jrt...@freebsd.org>
AuthorDate: 2024-09-10 17:54:44 +0000
Commit: Jessica Clarke <jrt...@freebsd.org>
CommitDate: 2024-09-10 17:54:44 +0000
depend-cleanup.sh: Extend clean_dep to support a custom regex
This will avoid having to duplicate the loop every time the default
regex isn't good enough, and will be used by upcoming commits.
---
tools/build/depend-cleanup.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
index 828586e9d231..cb2551fced78 100755
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -89,11 +89,12 @@ run()
# $1 directory
# $2 source filename w/o extension
# $3 source extension
+# $4 optional regex for egrep -w
clean_dep()
{
for libcompat in "" $ALL_libcompats; do
dirprfx=${libcompat:+obj-lib${libcompat}/}
- if egrep -qw "$2\.$3" "$OBJTOP"/$dirprfx$1/.depend.$2.*o
2>/dev/null; then
+ if egrep -qw "${4:-$2\.$3}" "$OBJTOP"/$dirprfx$1/.depend.$2.*o
2>/dev/null; then
echo "Removing stale ${libcompat:+lib${libcompat}
}dependencies and objects for $2.$3"
run rm -f \
"$OBJTOP"/$dirprfx$1/.depend.$2.* \
