git: ebf862fb552f - main - build: fix list-old-dirs / check-old-dirs
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 25 Aug 2025 22:02:41 UTC
The branch main has been updated by sobomax:
URL: https://cgit.FreeBSD.org/src/commit/?id=ebf862fb552f05f63615165f86088dd334e9f211
commit ebf862fb552f05f63615165f86088dd334e9f211
Author: Maxim Sobolev <sobomax@FreeBSD.org>
AuthorDate: 2025-08-25 22:00:14 +0000
Commit: Maxim Sobolev <sobomax@FreeBSD.org>
CommitDate: 2025-08-25 22:00:33 +0000
build: fix list-old-dirs / check-old-dirs
Fix list-old-dirs to not generate empty line at the end of the
output if OLD_DIRS happens to have a space at the end of the
last word of the output before the final \n. Then that space
is turned into \n and we end up with a blank line.
Futhermore this gets converted into a "/" i.e. root fs when
calling check-old-dirs.
This is the regression since a8267ecc3df0a.
Reviewed by: emaste
Approved by: emaste
Sponsored by: Sippy Software, Inc.
Differential Revision: https://reviews.freebsd.org/D52153
MFC After: 3 days
---
Makefile.inc1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index d899f994a40d..c6cbc411be80 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -3712,7 +3712,7 @@ check-old-libs: .PHONY
list-old-dirs: .PHONY
@cd ${.CURDIR}; \
${MAKE} -f ${.CURDIR}/Makefile.inc1 ${.MAKEFLAGS} ${.TARGET} \
- -V OLD_DIRS | sed -E 's/[[:space:]]+/\n/g' | sort -r
+ -V "OLD_DIRS:ts\n" | sort -r
delete-old-dirs: .PHONY
@echo ">>> Removing old directories"