Date: Sat, 31 Jul 2021 22:25:06 GMT From: Warner Losh <imp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: a226a9cf8ecf - main - awk: use awkgram.tab.h consistently Message-ID: <202107312225.16VMP67g012334@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a226a9cf8ecf429c3fd60b24e25e0bdb546a58b7 commit a226a9cf8ecf429c3fd60b24e25e0bdb546a58b7 Author: Warner Losh <imp@FreeBSD.org> AuthorDate: 2021-07-31 22:17:44 +0000 Commit: Warner Losh <imp@FreeBSD.org> 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=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107312225.16VMP67g012334>