From 13c9cf4c53f66cc28de27c487c3dcd2ac40a9493 Mon Sep 17 00:00:00 2001
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Fri, 12 Apr 2013 00:34:19 +0000
Subject: [PATCH] If doing buildworld -DWITH_BMAKE make sure bmake does the
 build.

---
 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1081649d5b5c..a396fc9c167c 100644
--- a/Makefile
+++ b/Makefile
@@ -281,6 +281,9 @@ kernel: buildkernel installkernel
 #
 upgrade_checks:
 .if !defined(.PARSEDIR)
+.if defined(WITH_BMAKE)
+	(cd ${.CURDIR} && ${MAKE} bmake)
+.else
 	@if ! (cd ${.CURDIR}/tools/build/make_check && \
 	    PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
 	    PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
@@ -288,6 +291,7 @@ upgrade_checks:
 	    (cd ${.CURDIR} && ${MAKE} make); \
 	fi
 .endif
+.endif
 
 #
 # Upgrade make(1) to the current version using the installed
@@ -302,12 +306,12 @@ MMAKE=		${MMAKEENV} ${MAKE} \
 		-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WERROR
 
-make: .PHONY
+make bmake: .PHONY
 	@echo
 	@echo "--------------------------------------------------------------"
 	@echo ">>> Building an up-to-date make(1)"
 	@echo "--------------------------------------------------------------"
-	${_+_}@cd ${.CURDIR}/usr.bin/make; \
+	${_+_}@cd ${.CURDIR}/usr.bin/${.TARGET}; \
 		${MMAKE} obj && \
 		${MMAKE} depend && \
 		${MMAKE} all && \