d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If doing buildworld -DWITH_BMAKE make sure bmake does the build.

Browse Source
This commit is contained in:
Simon J. Gerraty 2013-04-12 00:34:19 +00:00
parent c0bc8af9b7
commit 13c9cf4c53
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=249395
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

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