svn commit: r301738 - stable/10

[Bryan Drewery]

Author: bdrewery
Date: Thu Jun  9 15:43:00 2016
New Revision: 301738
URL: https://svnweb.freebsd.org/changeset/base/301738

Log:
  MFC r301465:
  
    Fix bmake version upgrade logic to use the new bmake.
  
  The '${WANT_MAKE} != "bmake"' logic seems wrong but is not being modified.

Modified:
  stable/10/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/Makefile
==============================================================================
--- stable/10/Makefile	Thu Jun  9 15:34:33 2016	(r301737)
+++ stable/10/Makefile	Thu Jun  9 15:43:00 2016	(r301738)
@@ -155,9 +155,13 @@ HAVE_MAKE=	bmake
 .else
 HAVE_MAKE=	fmake
 .endif
+.if ${HAVE_MAKE} != ${WANT_MAKE} || \
+    (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION})
+NEED_MAKE_UPGRADE= t
+.endif
 .if exists(${MYMAKE})
 SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk
-.elif ${WANT_MAKE} != ${HAVE_MAKE} || ${WANT_MAKE} != "bmake"
+.elif defined(NEED_MAKE_UPGRADE) || ${WANT_MAKE} != "bmake"
 # 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}` \
@@ -334,8 +338,7 @@ kernel: buildkernel installkernel
 # for building the world.
 #
 upgrade_checks:
-.if ${HAVE_MAKE} != ${WANT_MAKE} || \
-    (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION})
+.if defined(NEED_MAKE_UPGRADE)
 	@${_+_}(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
 .elif ${WANT_MAKE} == "fmake"
 	@if ! (cd ${.CURDIR}/tools/build/make_check && \