git: 9501683925b2 - main - Revert "Don't omit bsd.compiler.mk for the nested delete-old in buildworld."
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 27 Jan 2023 17:41:59 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=9501683925b217b38d332f4dc13f9fe8f9ea0c29
commit 9501683925b217b38d332f4dc13f9fe8f9ea0c29
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2023-01-27 17:41:47 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2023-01-27 17:41:47 +0000
Revert "Don't omit bsd.compiler.mk for the nested delete-old in buildworld."
The original motivation (src.opts.mk needing bsd.comppiler.mk to
determine if CXX is supported) is no longer relevant now that CXX is
non-optional.
This reverts commit b9cb80883bce6dc992cf05ae2e59089a60d311ec.
---
Makefile.inc1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.inc1 b/Makefile.inc1
index dac412559716..ae50cdda508f 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1024,7 +1024,7 @@ _worldtmp: .PHONY
${_+_}@if [ -e "${WORLDTMP}" ]; then \
echo ">>> Deleting stale files in build tree..."; \
cd ${.CURDIR}; env PATH=${TMPPATH:Q}:${PATH:Q} ${WMAKE:NPATH=*} \
- -DBATCH_DELETE_OLD_FILES delete-old \
+ _NO_INCLUDE_COMPILERMK=t -DBATCH_DELETE_OLD_FILES delete-old \
delete-old-libs >/dev/null; \
fi
rm -rf ${WORLDTMP}/legacy/usr/include