summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-02-24 17:18:49 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-02-24 17:18:49 +0000
commitd04c32033e0dcaccd77119c51256e4880a52ae1d (patch)
tree379bb7271bf311094533669910d17b196db5d703 /Makefile
parent9f214ef5c9216403544bbcbbf6f5edf34b20bb2e (diff)
downloadFreeBSD-src-d04c32033e0dcaccd77119c51256e4880a52ae1d.zip
FreeBSD-src-d04c32033e0dcaccd77119c51256e4880a52ae1d.tar.gz
Support a WANT_MAKE_VERSION.
This will be used soon for .dinclude support in FAST_DEPEND. MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 09d1c9b..0be017d 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
OpenPOWER on IntegriCloud