From b9cb80883bce6dc992cf05ae2e59089a60d311ec Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 18 Nov 2022 20:11:07 -0800
Subject: [PATCH] Don't omit bsd.compiler.mk for the nested delete-old in
 buildworld.

src.opts.mk will need bsd.compiler.mk to determine if CXX is
supported.  Without this, src.opts.mk always marks CXX as broken and
attempts to delete all dependencies of MK_CXX from WORLDTMP.

Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D36890
---
 Makefile.inc1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index f509208d045f..c14d801254c4 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1025,7 +1025,7 @@ _worldtmp: .PHONY
 	${_+_}@if [ -e "${WORLDTMP}" ]; then \
 		echo ">>> Deleting stale files in build tree..."; \
 		cd ${.CURDIR}; env PATH=${TMPPATH}:${PATH} ${WMAKE:NPATH=*} \
-		    _NO_INCLUDE_COMPILERMK=t -DBATCH_DELETE_OLD_FILES delete-old \
+		    -DBATCH_DELETE_OLD_FILES delete-old \
 		    delete-old-libs >/dev/null; \
 	fi
 	rm -rf ${WORLDTMP}/legacy/usr/include