diff options
| author | Warner Losh <imp@FreeBSD.org> | 2014-05-10 16:37:33 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2014-05-10 16:37:33 +0000 |
| commit | 4d9b013a6308e35806ec533f8dd38f716b83e617 (patch) | |
| tree | ef00c7223304ebba4471e804d3c2939c94b3758a /Makefile | |
| parent | 21f76c672f8d6e6194dc7e4983963f0c25a3d480 (diff) | |
| download | src-test2-4d9b013a6308e35806ec533f8dd38f716b83e617.tar.gz src-test2-4d9b013a6308e35806ec533f8dd38f716b83e617.zip | |
Remove a few more vestiges of allowing WITHOUT_BMAKE to imply you want
to buid with fmake.
Notes
Notes:
svn path=/head/; revision=265827
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 4 insertions, 11 deletions
@@ -316,13 +316,6 @@ kernel: buildkernel installkernel upgrade_checks: .if ${HAVE_MAKE} != ${WANT_MAKE} @(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,}) -.elif ${WANT_MAKE} == "fmake" - @if ! (cd ${.CURDIR}/tools/build/make_check && \ - PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \ - PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \ - then \ - (cd ${.CURDIR} && ${MAKE} make); \ - fi .endif # @@ -336,18 +329,18 @@ MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \ MMAKE= ${MMAKEENV} ${MAKE} \ -D_UPGRADING -DNO_MAN -DNO_SHARED \ -DNO_CPU_CFLAGS -DNO_WERROR \ - DESTDIR= MK_TESTS=no PROGNAME=${MYMAKE:T} + DESTDIR= PROGNAME=${MYMAKE:T} -make bmake: .PHONY +bmake: .PHONY @echo @echo "--------------------------------------------------------------" - @echo ">>> Building an up-to-date make(1)" + @echo ">>> Building an up-to-date ${.TARGET}(1)" @echo "--------------------------------------------------------------" ${_+_}@cd ${.CURDIR}/usr.bin/${.TARGET}; \ ${MMAKE} obj && \ ${MMAKE} depend && \ ${MMAKE} all && \ - ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= NO_MAN=t + ${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= tinderbox toolchains kernel-toolchains: upgrade_checks |