diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2016-03-02 16:14:46 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2016-03-02 16:14:46 +0000 |
| commit | 52259a98adba7622f236db46a330e61df0c84fb1 (patch) | |
| tree | 9c83d6fb30867514fbcff33f80605a1fb118d720 /Makefile | |
| parent | aef2f6ad2e64655fcc1ab4f9b26e1c7eb20bbe00 (diff) | |
| parent | 39c44571c032ce86b43e87de4cc716ea696c265d (diff) | |
Notes
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -140,6 +140,7 @@ TGTS+= ${BITGTS} .ORDER: buildworld distributeworld .ORDER: buildworld buildkernel .ORDER: installworld distribution +.ORDER: installworld installkernel .ORDER: buildkernel installkernel .ORDER: buildkernel installkernel.debug .ORDER: buildkernel reinstallkernel @@ -299,11 +300,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 |