From 51a9efecaef76cd63b71b240cd1b9dc64c40a1b7 Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 12 Mar 2016 18:55:16 +0000
Subject: [PATCH] MFC r295980:

  Support a WANT_MAKE_VERSION.


git-svn-id: svn://svn.freebsd.org/base/stable/10@296741 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 Makefile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 21ba80030..6fb3e19ef 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 && \
-- 
2.45.0