Author: sjg
Date: Fri Apr 12 00:34:19 2013
New Revision: 249395
URL: http://svnweb.freebsd.org/changeset/base/249395
Log:
If doing buildworld -DWITH_BMAKE make sure bmake does the build.
Modified:
head/Makefile
Modified: head/Makefile
==============================================================================
--- head/Makefile Thu Apr 11 23:45:40 2013 (r249394)
+++ head/Makefile Fri Apr 12 00:34:19 2013 (r249395)
@@ -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 && \
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
