From nobody Tue Dec 21 13:48:20 2021 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 052D318FC105; Tue, 21 Dec 2021 13:48:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JJHpr3lxfz3LSd; Tue, 21 Dec 2021 13:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 52FF828B2; Tue, 21 Dec 2021 13:48:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BLDmKou040135; Tue, 21 Dec 2021 13:48:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BLDmKnS040134; Tue, 21 Dec 2021 13:48:20 GMT (envelope-from git) Date: Tue, 21 Dec 2021 13:48:20 GMT Message-Id: <202112211348.1BLDmKnS040134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 5815ac31d9c9 - stable/13 - Fix 'make bmake' top-level bootstrapping. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5815ac31d9c98098242f6709c7a261481ae300fb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640094500; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0cDioXFl63fHBgGOOCBqLg2hbWxoYfnn0HvVqViUCmo=; b=KHLC5+OSLVxk/1YxuneZO3SF7jieLdamSHPwiuELCqsGfkVNCbG6ZBRiTxuyOpOSac3hBC gpoNduGoZORStnhlVabWLp52fmGMoJ6cGcAFtf/EGQq76LX911InzKsu3TZjgM9shvmyr5 yx7Vv9Ul5oftqBAT3l2dYv6XeLrg2gHjt9dh8GV2SYlNkLwNY8X6nujtfb4qVJWtUW61Sn +WLZ/XwasjqYBjp4mRC8jlCRBxDv2ZH65gEBhNtOl8WmjYyedla4OxB/j/2BQfkQCVrwzD C98UFYhXfbkUv7Qz07LE9rw71LznfZdH1XuaRUQm0/YigVAes/mX59ESslLF4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640094500; a=rsa-sha256; cv=none; b=xLCUYaE+34WQvrnThkSV5YHpOKltnzAlAErkLYH4RvlN6bHxKvvpyiU7C610HtOhIMLPw5 fn6tcpEZShMV5ZnedZuPbBkp83uDkmRiFdqXS8I3o0MQt27dR3pzhBP02BLZ1FxgpadcLK 6r3FWuwr31POgZR4xGFyeheBxmsBNz2dQwj7HgJlcMKQWp5cupXGhdtITHrAsb6tA3jtS1 0OCd9CnmLyZ3UQ/+1oXUtoGmmCfLfWkAkaG0WOpz0v+RraO0ftL6u/g9LYdUQH4PjG5Viz 03rcnovjX7o/k8l1Yb9EItl6XSsfJa5oHW4c5po5pda6iLdXNM0kRn3Ll0vqbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5815ac31d9c98098242f6709c7a261481ae300fb commit 5815ac31d9c98098242f6709c7a261481ae300fb Author: Bryan Drewery AuthorDate: 2021-03-06 17:45:08 +0000 Commit: Dimitry Andric 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