aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2016-02-24 17:18:49 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2016-02-24 17:18:49 +0000
commit22944b41344c2e270a621cc1be65e533858ddd29 (patch)
tree379bb7271bf311094533669910d17b196db5d703 /Makefile
parentf189805dcc808b150370a0345bc2047ff1dde401 (diff)
Notes
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 09d1c9b0e054..0be017d9f713 100644
--- a/Makefile
+++ b/Makefile
@@ -297,11 +297,9 @@ kernel: buildkernel installkernel
# Perform a few tests to determine if the installed tools are adequate
# for building the world.
#
-# Note: if we ever need to care about the version of bmake, simply testing
-# MAKE_VERSION against a required version should suffice.
-#
upgrade_checks:
-.if ${HAVE_MAKE} != ${WANT_MAKE}
+.if ${HAVE_MAKE} != ${WANT_MAKE} || \
+ (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION})
@(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
.endif