aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2016-06-05 23:04:15 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2016-06-05 23:04:15 +0000
commitbd2464674d9488b7a268cb1727e31ad8cc49fac7 (patch)
tree6b2d484904e0466540d402ead8409a9e6a17def4 /Makefile
parent96306ff24d0a44db2abfbab6b4ed21bd7ae63221 (diff)
downloadsrc-bd2464674d9488b7a268cb1727e31ad8cc49fac7.tar.gz
src-bd2464674d9488b7a268cb1727e31ad8cc49fac7.zip
Fix bmake version upgrade logic to use the new bmake.
Otherwise it was only used on the next build. This was a flaw in r295980. MFC after: 3 days Sponsored by: EMC / Isilon Storage Division
Notes
Notes: svn path=/head/; revision=301465
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index f4142b24664d..6557bd054fba 100644
--- a/Makefile
+++ b/Makefile
@@ -170,9 +170,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}
+.elif defined(NEED_MAKE_UPGRADE)
# 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}` \
@@ -313,8 +317,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,,})
.endif