Date: Sat, 6 Mar 2021 17:45:35 GMT From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: eb8bf6bb4204 - main - Fix 'make bmake' top-level bootstrapping. Message-ID: <202103061745.126HjZT4061277@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by bdrewery: URL: https://cgit.FreeBSD.org/src/commit/?id=eb8bf6bb4204c302e2329b68c8a930be5d44bc9c commit eb8bf6bb4204c302e2329b68c8a930be5d44bc9c Author: Bryan Drewery <bdrewery@FreeBSD.org> AuthorDate: 2021-03-06 17:45:08 +0000 Commit: Bryan Drewery <bdrewery@FreeBSD.org> CommitDate: 2021-03-06 17:45:08 +0000 Fix 'make bmake' top-level bootstrapping. Fixes: ee10666327b62 --- Makefile | 2 +- usr.bin/bmake/Makefile.inc | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1a1739acb0fe..3b37b7e1f669 100644 --- a/Makefile +++ b/Makefile @@ -458,7 +458,7 @@ MMAKE= ${MMAKEENV} ${MAKE} \ OBJTOP=${MYMAKE:H}/obj \ OBJROOT='$${OBJTOP}/' \ MAKEOBJDIRPREFIX= \ - MAN= -DNO_SHARED \ + MK_MAN=no -DNO_SHARED \ -DNO_CPU_CFLAGS MK_WERROR=no \ -DNO_SUBDIR \ DESTDIR= PROGNAME=${MYMAKE:T} diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc index 9960f0ceeb2d..8e10a654a754 100644 --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -9,9 +9,11 @@ .if exists(${.CURDIR}/tests) PROG= make +.if ${PROGNAME:U} != "bmake" LINKS= ${BINDIR}/make ${BINDIR}/bmake MLINKS= ${MAN} b${MAN} .endif +.endif .if !defined(MK_SHARED_TOOLCHAIN) || ${MK_SHARED_TOOLCHAIN} == "no" NO_SHARED?= YES
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103061745.126HjZT4061277>