diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2021-03-06 17:45:08 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2021-12-21 13:44:51 +0000 |
| commit | 5815ac31d9c98098242f6709c7a261481ae300fb (patch) | |
| tree | 5d6dbe01f631cc2ffc599abe0ddcb40ab3683334 | |
| parent | 886e5802c443574e1af0d9561e4d863dfcf1c5c2 (diff) | |
Fix 'make bmake' top-level bootstrapping.
Fixes: ee10666327b62
(cherry picked from commit eb8bf6bb4204c302e2329b68c8a930be5d44bc9c)
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/bmake/Makefile.inc | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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 |