From owner-dev-commits-src-all@freebsd.org Sat Jul 31 22:25:06 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7932E665A10; Sat, 31 Jul 2021 22:25:06 +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 4Gcf3631Ypz3MGm; Sat, 31 Jul 2021 22:25:06 +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 4FEC620E00; Sat, 31 Jul 2021 22:25:06 +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 16VMP60f012335; Sat, 31 Jul 2021 22:25:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16VMP67g012334; Sat, 31 Jul 2021 22:25:06 GMT (envelope-from git) Date: Sat, 31 Jul 2021 22:25:06 GMT Message-Id: <202107312225.16VMP67g012334@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a226a9cf8ecf - main - awk: use awkgram.tab.h consistently MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a226a9cf8ecf429c3fd60b24e25e0bdb546a58b7 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Jul 2021 22:25:06 -0000 The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a226a9cf8ecf429c3fd60b24e25e0bdb546a58b7 commit a226a9cf8ecf429c3fd60b24e25e0bdb546a58b7 Author: Warner Losh AuthorDate: 2021-07-31 22:17:44 +0000 Commit: Warner Losh CommitDate: 2021-07-31 22:24:12 +0000 awk: use awkgram.tab.h consistently yacc makes awkgram.h. However, one true awk includes awkgram.tab.h, so we link to for the builds. Make sure that we consistently link to it. Also, restore the awkgram.tab.h dependency to maketab. It should not have been deleted, despite apparently making meta build on stable/12 work. The important missing arc was proctab.c's dependence on awkgram.tab.h. MFC After: 1 day (build breakage) Fixes: c50c8502cb629571f35089690d6e9a9bc4d60813 Sponsored by: Netflix --- usr.bin/awk/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile index cc740a46b82c..89dbf4460f45 100644 --- a/usr.bin/awk/Makefile +++ b/usr.bin/awk/Makefile @@ -22,12 +22,12 @@ CLEANFILES= maketab proctab.c awkgram.tab.h awkgram.tab.h: awkgram.h ln -sf ${.ALLSRC:M*.h} ${.TARGET} -proctab.c: maketab awkgram.h - ${BTOOLSPATH:U.}/maketab awkgram.h > proctab.c +proctab.c: maketab awkgram.tab.h + ${BTOOLSPATH:U.}/maketab awkgram.tab.h > proctab.c DEPENDOBJS+= maketab build-tools: maketab -maketab: ${BUILD_TOOLS_META} +maketab: awkgram.tab.h ${BUILD_TOOLS_META} # awk needs some work before we can connect these tests to the build #HAS_TESTS=