From nobody Fri Jun 30 06:52:50 2023 X-Original-To: dev-commits-src-main@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 4QsmGp6XY2z4kX75; Fri, 30 Jun 2023 06:52:50 +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 4QsmGp5qj6z3JMs; Fri, 30 Jun 2023 06:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688107970; 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=Svb/p8gIcHjw5kRdXmMtsvvbVu0ucEMqEdqSBUlBb1Q=; b=unjGKVFTAEZjBSzcgtyvraD07tcGmVSLrTsOJ8zzffoqHFFm9Bf3q1/uLCGG9C5Xzu21ps nMzc32in7aU7dFd4e/uxqFZR6YRSuzOo+j5hLPpDNF3ciasDiJn2fqzll94zM361SU8FiF DNlVvBbMGQ2z1sOeJs7hYUA6e1WBndVnbqezokhnX/L2l4ZWhUJHG2eT+LV738JpQ4oSWn e3JFQ2qpMnyylraPgonxuQOF52oR+5Zlf5iYaFWx2RDzBan0B1lHm7+oHReU4PjLTqlQG3 TD6xHU6zJLvL/gwD12i/AAE81g3LolJbnf3tmccMfBjvuCn2zz66+p0vTjfdew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688107970; 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=Svb/p8gIcHjw5kRdXmMtsvvbVu0ucEMqEdqSBUlBb1Q=; b=eDdBFD4nkwrjp044EW3xnNfX7wy13Ibj3WTqXKygjgR4lfNQoAMTy4wvdp7qwxKszk0P/m i9DGHXQd4U/pmrAtAWl38n1ZotaciBCCNw1nkUP2k62Ai2QI9fZ/bqpd5B3Av7Hx52vfxF CYvxRmXOY1R3UpN5FIWWrAXv4kB9HU5eQien8CzcSRvQj4lnTH+945qSlZq4gRZYT9YYRG KgBXIu6ZdffrPfit/Ppw+htrKyEAxQ2IpiAbssvUf3ISQowgwa4yV0rN5QeFN9JS+/x83S +fTAu31OnC26SNYZc2AZns1hy34rcOFJ2qpZpY2LxKGggMizT5LvlPeFD0cYXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688107970; a=rsa-sha256; cv=none; b=KY6y2xMM6X/alLH8pT6JrSK+AAFiH9D+36hqN01DrY0wTXRZu9eSGPiS/wFsTemTVPmOQb njf36+mXKfAoV6ZZ6OsXF+MRFmMhlCTYqRsSsg8F/ZudaaSbKmV4XkUOzSLv8Nn4bUTkp0 4xJHtG9N+qSPjuCq46tiGpV4JTZxga5Tw8Svrn1VqtUTk4FJvAMeA4W8Qu/NjDHjZMpAPh 7u0uYP+4/V2h+iXZMjZu5bCAJUyIi3kIjvxLLoXdnGB81qgq6S+o+RzGPCa3yoqKTj72iP G2ccRTkA2/6XPYiPJ/be/2am5hWofK+oV9wqkPIL13y54zKETflbB6eB5Bgdgw== 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 4QsmGp4vC4zpNZ; Fri, 30 Jun 2023 06:52:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35U6qoYZ027108; Fri, 30 Jun 2023 06:52:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35U6qoVC027107; Fri, 30 Jun 2023 06:52:50 GMT (envelope-from git) Date: Fri, 30 Jun 2023 06:52:50 GMT Message-Id: <202306300652.35U6qoVC027107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: fcc8d727023c - main - Separate dependencies on tools built for host. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcc8d727023c3ac0f12b8aebc50f892cfd32992b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=fcc8d727023c3ac0f12b8aebc50f892cfd32992b commit fcc8d727023c3ac0f12b8aebc50f892cfd32992b Author: Simon J. Gerraty AuthorDate: 2023-06-30 06:52:03 +0000 Commit: Simon J. Gerraty CommitDate: 2023-06-30 06:52:03 +0000 Separate dependencies on tools built for host. When generated files depend on tools that need to be built for host, we need to carefully separate them for the DIRDEPS_BUILD so we only build them once. Reviewed by: stevek Sponsored by: Juniper Networks, Inc. --- bin/sh/Makefile | 9 ++++++--- usr.bin/awk/Makefile | 3 ++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bin/sh/Makefile b/bin/sh/Makefile index 039da7309adc..fafc223b4b29 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -44,22 +44,25 @@ build-tools: mknodes mksyntax DEPENDOBJS+= mknodes mksyntax mknodes mksyntax: ${BUILD_TOOLS_META} +builtins.c builtins.h: mkbuiltins +syntax.c syntax.h: mksyntax +nodes.c nodes.h: mknodes .endif .ORDER: builtins.c builtins.h builtins.h: .NOMETA -builtins.c builtins.h: mkbuiltins builtins.def +builtins.c builtins.h: builtins.def sh ${.CURDIR}/mkbuiltins ${.CURDIR} .ORDER: nodes.c nodes.h nodes.h: .NOMETA -nodes.c nodes.h: mknodes nodetypes nodes.c.pat +nodes.c nodes.h: nodetypes nodes.c.pat ${BTOOLSPATH:U.}/mknodes ${.CURDIR}/nodetypes ${.CURDIR}/nodes.c.pat .ORDER: syntax.c syntax.h syntax.h: .NOMETA -syntax.c syntax.h: mksyntax +syntax.c syntax.h: ${BTOOLSPATH:U.}/mksyntax token.h: mktokens diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile index f604684804fa..ee8f7c3f282b 100644 --- a/usr.bin/awk/Makefile +++ b/usr.bin/awk/Makefile @@ -22,12 +22,13 @@ CLEANFILES= maketab proctab.c awkgram.tab.h awkgram.tab.h: awkgram.h ln -sf ${.ALLSRC:M*.h} ${.TARGET} -proctab.c: maketab awkgram.tab.h +proctab.c: awkgram.tab.h ${BTOOLSPATH:U.}/maketab awkgram.tab.h > proctab.c .if ${MACHINE} == "host" || ${MK_DIRDEPS_BUILD} == "no" DEPENDOBJS+= maketab build-tools: maketab +proctab.c: maketab maketab: awkgram.tab.h ${BUILD_TOOLS_META} .endif