diff options
| author | sjg <sjg@FreeBSD.org> | 2013-04-12 00:34:19 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-04-12 00:34:19 +0000 |
| commit | 5f0af63a3ffd1c7e77dbd701f1eeee90e4c34206 (patch) | |
| tree | 792754f514d6cca2aacd0201a0ce8fc7eda91073 /Makefile | |
| parent | 255ff35d8e6bdcc027cdd6e4cc035ebdde81be84 (diff) | |
| download | FreeBSD-src-5f0af63a3ffd1c7e77dbd701f1eeee90e4c34206.zip FreeBSD-src-5f0af63a3ffd1c7e77dbd701f1eeee90e4c34206.tar.gz | |
If doing buildworld -DWITH_BMAKE make sure bmake does the build.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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 && \ |
