diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-06-09 15:43:00 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-06-09 15:43:00 +0000 |
| commit | c372ce75dc97bf83867a36ec0b0aa3200b168df5 (patch) | |
| tree | 3e685625fe98e4200507c096f4bb30fe80567086 /Makefile | |
| parent | 6e64ecac944fc256b587b800c40e6c5807936fb5 (diff) | |
| download | FreeBSD-src-c372ce75dc97bf83867a36ec0b0aa3200b168df5.zip FreeBSD-src-c372ce75dc97bf83867a36ec0b0aa3200b168df5.tar.gz | |
MFC r301465:
Fix bmake version upgrade logic to use the new bmake.
The '${WANT_MAKE} != "bmake"' logic seems wrong but is not being modified.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -155,9 +155,13 @@ HAVE_MAKE= bmake .else HAVE_MAKE= fmake .endif +.if ${HAVE_MAKE} != ${WANT_MAKE} || \ + (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION}) +NEED_MAKE_UPGRADE= t +.endif .if exists(${MYMAKE}) SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk -.elif ${WANT_MAKE} != ${HAVE_MAKE} || ${WANT_MAKE} != "bmake" +.elif defined(NEED_MAKE_UPGRADE) || ${WANT_MAKE} != "bmake" # It may not exist yet but we may cause it to. # In the case of fmake, upgrade_checks may cause a newer version to be built. SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \ @@ -334,8 +338,7 @@ kernel: buildkernel installkernel # for building the world. # upgrade_checks: -.if ${HAVE_MAKE} != ${WANT_MAKE} || \ - (defined(WANT_MAKE_VERSION) && ${MAKE_VERSION} < ${WANT_MAKE_VERSION}) +.if defined(NEED_MAKE_UPGRADE) @${_+_}(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,}) .elif ${WANT_MAKE} == "fmake" @if ! (cd ${.CURDIR}/tools/build/make_check && \ |
