From 3be1d4bf0f8c1f48c020424ad9e5315cda2b6682 Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Tue, 6 May 2014 04:22:37 +0000
Subject: 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).

---
 Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 6cdd0fe..6cc56b2 100644
--- a/Makefile
+++ b/Makefile
@@ -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}` \
-- 
cgit v1.1