The branch stable/15 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=d97fa8e49a4ad7134e6b5ba4f3aa4e262062256b
commit d97fa8e49a4ad7134e6b5ba4f3aa4e262062256b Author: Dag-Erling Smørgrav <[email protected]> AuthorDate: 2025-12-31 13:10:39 +0000 Commit: Dag-Erling Smørgrav <[email protected]> CommitDate: 2026-01-12 17:18:21 +0000 depend-cleanup.sh: Reduce repetition MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D54329 (cherry picked from commit aa611fa7e835ae77a623cc6d05020f5ee76dc881) --- tools/build/depend-cleanup.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 2e52262693e5..403b0823a2b6 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -161,13 +161,13 @@ run() # $4 optional regex for egrep -w clean_dep() { + local dirprfx dir for libcompat in "" $ALL_libcompats; do - dirprfx=${libcompat:+obj-lib${libcompat}/} - if egrep -qw "${4:-$2\.$3}" "$OBJTOP"/$dirprfx$1/.depend.$2.*o 2>/dev/null; then + dirprfx=${libcompat:+obj-lib${libcompat}} + dir="${OBJTOP%/}/${dirprfx}/$1" + if egrep -qw "${4:-$2\.$3}" "${dir}"/.depend.$2.*o 2>/dev/null; then echo "Removing stale ${libcompat:+lib${libcompat} }dependencies and objects for $2.$3" - run rm -fv \ - "$OBJTOP"/$dirprfx$1/.depend.$2.* \ - "$OBJTOP"/$dirprfx$1/$2.*o + run rm -fv "${dir}"/.depend.$2.* "${dir}"/$2.*o fi done } @@ -183,12 +183,13 @@ clean_dep() # $4 regex for egrep -w clean_obj() { + local dirprfx dir for libcompat in "" $ALL_libcompats; do - dirprfx=${libcompat:+obj-lib${libcompat}/} - if strings "$OBJTOP"/$dirprfx$1/$2.*o 2>/dev/null | egrep -qw "${4}"; then + dirprfx=${libcompat:+obj-lib${libcompat}} + dir="${OBJTOP%/}/${dirprfx}/$1" + if strings "${dir}"/$2.*o 2>/dev/null | egrep -qw "${4}"; then echo "Removing stale ${libcompat:+lib${libcompat} }objects for $2.$3" - run rm -fv \ - "$OBJTOP"/$dirprfx$1/$2.*o + run rm -fv "${dir}"/$2.*o fi done } @@ -221,6 +222,7 @@ extract_src_opts() extract_obj_opts() { + local fn for fn; do if [ -f "${fn}" ]; then cat "${fn}"
