git: 5815ac31d9c9 - stable/13 - Fix 'make bmake' top-level bootstrapping.
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 21 Dec 2021 13:48:20 UTC
The branch stable/13 has been updated by dim:
URL: https://cgit.FreeBSD.org/src/commit/?id=5815ac31d9c98098242f6709c7a261481ae300fb
commit 5815ac31d9c98098242f6709c7a261481ae300fb
Author: Bryan Drewery <bdrewery@FreeBSD.org>
AuthorDate: 2021-03-06 17:45:08 +0000
Commit: Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2021-12-21 13:44:51 +0000
Fix 'make bmake' top-level bootstrapping.
Fixes: ee10666327b62
(cherry picked from commit eb8bf6bb4204c302e2329b68c8a930be5d44bc9c)
---
Makefile | 2 +-
usr.bin/bmake/Makefile.inc | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 67f2195cd603..c64873fb241b 100644
--- a/Makefile
+++ b/Makefile
@@ -457,7 +457,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