svn commit: r295980 - head

[Bryan Drewery]

Author: bdrewery
Date: Wed Feb 24 17:18:49 2016
New Revision: 295980
URL: https://svnweb.freebsd.org/changeset/base/295980

Log:
  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

Modified:
  head/Makefile

Modified: head/Makefile
==============================================================================
--- head/Makefile	Wed Feb 24 17:18:43 2016	(r295979)
+++ head/Makefile	Wed Feb 24 17:18:49 2016	(r295980)
@@ -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