Date: Wed, 3 Jan 2024 19:16:01 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 01918855cfc9 - main - bsd.own.mk: Assume a modern make Message-ID: <202401031916.403JG14w087277@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=01918855cfc9e5ce4c324d11c6b3b9a149638174 commit 01918855cfc9e5ce4c324d11c6b3b9a149638174 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2024-01-02 16:33:19 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2024-01-03 19:13:57 +0000 bsd.own.mk: Assume a modern make Commit 83cb5bae966d7 added a check for MAKE_VERSION being new enough to handle CTFCONVERT_CMD being an empty string since fmake of the time didn't support it until just a few commits before 83cb5bae966d7. Later, it was augmented with a check for .PARSEDIR to see if bmake was running. fmake and boostrapping from fmake haven't worked in maybe 6 or 8 years, so we can remove the check here. If you want to update from your FreeBSD 7 or FreeBSD 8 systems, you're even more out of luck than you were before and must jump to an older version before jumping to current for the source upgrade path. Sponsored by: Netflix Reviewed by: brooks, emaste Pull Request: https://github.com/freebsd/freebsd-src/pull/980 --- share/mk/bsd.own.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index aec88d64850f..bc53f3679e77 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -154,10 +154,8 @@ __<bsd.own.mk>__: .if ${MK_CTF} != "no" CTFCONVERT_CMD= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} -.elif defined(.PARSEDIR) || (defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300) -CTFCONVERT_CMD= .else -CTFCONVERT_CMD= @: +CTFCONVERT_CMD= .endif .endif # !_WITHOUT_SRCCONF
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401031916.403JG14w087277>