summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-03-12 18:55:16 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-03-12 18:55:16 +0000
commit86df18f4d72ccc66984c67e64664b17ebd03c806 (patch)
tree63d0528bff857124beb131b88b88d6ce2c07c124 /Makefile
parentdbe4d1ae875fee186b832c173c76185cff1f735d (diff)
downloadFreeBSD-src-86df18f4d72ccc66984c67e64664b17ebd03c806.zip
FreeBSD-src-86df18f4d72ccc66984c67e64664b17ebd03c806.tar.gz
MFC r295980:
Support a WANT_MAKE_VERSION.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 21ba800..6fb3e19 100644
--- a/Makefile
+++ b/Makefile
@@ -331,11 +331,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,,})
.elif ${WANT_MAKE} == "fmake"
@if ! (cd ${.CURDIR}/tools/build/make_check && \
OpenPOWER on IntegriCloud