diff options
| author | imp <imp@FreeBSD.org> | 2014-05-06 04:22:37 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-05-06 04:22:37 +0000 |
| commit | 3be1d4bf0f8c1f48c020424ad9e5315cda2b6682 (patch) | |
| tree | 895d7737181b262c8b64d4a9961560dffd90ac3a /Makefile | |
| parent | 8e7526bbf72553ac0bca045dd8d1fb0ffefdc036 (diff) | |
| download | FreeBSD-src-3be1d4bf0f8c1f48c020424ad9e5315cda2b6682.zip FreeBSD-src-3be1d4bf0f8c1f48c020424ad9e5315cda2b6682.tar.gz | |
Remove support for WITHOUT_BMAKE. bmake is now the only make that can
build world, so it is the only make we build or install. fmake is
still in the tree, but disconnected, and upgrades from older systems
that still have bmake has not been removed, but its state has not been
tested (it should work given how minimal the work to upgrade to bmake
is).
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -139,11 +139,7 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH=${PATH} ${MAKE} \ # Choices add to complexity though. # We cannot blindly use a make which may not be the one we want # so be exlicit - until all choice is removed. -.if !defined(WITHOUT_BMAKE) WANT_MAKE= bmake -.else -WANT_MAKE= fmake -.endif MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE} .if defined(.PARSEDIR) HAVE_MAKE= bmake @@ -152,7 +148,7 @@ HAVE_MAKE= fmake .endif .if exists(${MYMAKE}) SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk -.elif ${WANT_MAKE} != ${HAVE_MAKE} || ${WANT_MAKE} != "bmake" +.elif ${WANT_MAKE} != ${HAVE_MAKE} # It may not exist yet but we may cause it to. # In the case of fmake, upgrade_checks may cause a newer version to be built. SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \ |
