svn commit: r356495 - stable/12/share/mk

[Bjoern A. Zeeb]

Author: bz
Date: Wed Jan  8 17:02:58 2020
New Revision: 356495
URL: https://svnweb.freebsd.org/changeset/base/356495

Log:
  MFC r354747:
  
    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.

Modified:
  stable/12/share/mk/bsd.dep.mk
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/share/mk/bsd.dep.mk
==============================================================================
--- stable/12/share/mk/bsd.dep.mk	Wed Jan  8 16:57:08 2020	(r356494)
+++ stable/12/share/mk/bsd.dep.mk	Wed Jan  8 17:02:58 2020	(r356495)
@@ -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}
@@ -124,7 +124,7 @@ CLEANFILES+= ${_YC}
 .ORDER: ${_YC} y.tab.h
 y.tab.h: .NOMETA
 ${_YC} y.tab.h: ${_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)
@@ -132,13 +132,13 @@ CLEANFILES+= y.tab.c y.tab.h
 .ORDER: ${_YC} ${_YH}
 ${_YH}: .NOMETA
 ${_YC} ${_YH}: ${_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