Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 15 Nov 2019 21:19:06 +0000 (UTC)
From:      "Bjoern A. Zeeb" <bz@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r354747 - head/share/mk
Message-ID:  <201911152119.xAFLJ6m4083768@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: bz
Date: Fri Nov 15 21:19:06 2019
New Revision: 354747
URL: https://svnweb.freebsd.org/changeset/base/354747

Log:
  Allow per-file lex and yacc options.
  
  In order to allow software with multiple (different) options
  for lex and yacc add extra per-file options to the calls.
  This is especially useful when one .l file needs -Pprefix.
  
  Reviewed by:		imp
  MFC after:		3 weeks
  Differential Revision:	https://reviews.freebsd.org/D22337

Modified:
  head/share/mk/bsd.dep.mk

Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk	Fri Nov 15 20:43:39 2019	(r354746)
+++ head/share/mk/bsd.dep.mk	Fri Nov 15 21:19:06 2019	(r354747)
@@ -108,7 +108,7 @@ OBJS_DEPEND_GUESS.${_S:${OBJS_SRCS_FILTER:ts:}}.o+=	${
 .for _LSRC in ${SRCS:M*.l:N*/*}
 .for _LC in ${_LSRC:R}.c
 ${_LC}: ${_LSRC}
-	${LEX} ${LFLAGS} -o${.TARGET} ${.ALLSRC}
+	${LEX} ${LFLAGS} ${LFLAGS.${_LSRC}} -o${.TARGET} ${.ALLSRC}
 OBJS_DEPEND_GUESS.${_LC:R}.o+=	${_LC}
 SRCS:=	${SRCS:S/${_LSRC}/${_LC}/}
 CLEANFILES+= ${_LC}
@@ -129,7 +129,7 @@ y.tab.h: ${_YC} .NOMETA
 ${_YC}: .PHONY .META
 .endif
 ${_YC}: ${_YSRC}
-	${YACC} ${YFLAGS} ${.ALLSRC}
+	${YACC} ${YFLAGS} ${YFLAGS.${_YSRC}} ${.ALLSRC}
 	cp y.tab.c ${_YC}
 CLEANFILES+= y.tab.c y.tab.h
 .elif !empty(YFLAGS:M-d)
@@ -142,13 +142,13 @@ ${_YH}: ${_YC} .NOMETA
 ${_YC}: .PHONY .META
 .endif
 ${_YC}: ${_YSRC}
-	${YACC} ${YFLAGS} -o ${_YC} ${.ALLSRC}
+	${YACC} ${YFLAGS} ${YFLAGS.${_YSRC}} -o ${_YC} ${.ALLSRC}
 SRCS+=	${_YH}
 CLEANFILES+= ${_YH}
 .endfor
 .else
 ${_YC}: ${_YSRC}
-	${YACC} ${YFLAGS} -o ${_YC} ${.ALLSRC}
+	${YACC} ${YFLAGS} ${YFLAGS.${_YSRC}} -o ${_YC} ${.ALLSRC}
 .endif
 OBJS_DEPEND_GUESS.${_YC:R}.o+=	${_YC}
 .endfor

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911152119.xAFLJ6m4083768>