Author: bdrewery
Date: Sat Mar 12 18:55:16 2016
New Revision: 296741
URL: https://svnweb.freebsd.org/changeset/base/296741
Log:
MFC r295980:
Support a WANT_MAKE_VERSION.
Modified:
stable/10/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/Makefile
==============================================================================
--- stable/10/Makefile Sat Mar 12 18:54:02 2016 (r296740)
+++ stable/10/Makefile Sat Mar 12 18:55:16 2016 (r296741)
@@ -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 && \
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
