Allow disabling dependency tracking if DEPEND_CFLAGS is empty.
This falls back on using the guesssed dependencies if so. Also remove a pre-bmake check while here. MFC after: 2 weeks Sponsored by: Dell EMC Isilon
This commit is contained in:
parent
711019f70d
commit
c2fd1d01e8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=321441
@ -195,13 +195,11 @@ ${DEPENDFILE}: .NOMETA
|
||||
DEPEND_CFLAGS+= -MD ${DEPEND_MP} -MF${DEPENDFILE}.${.TARGET:${DEPEND_FILTER}}
|
||||
DEPEND_CFLAGS+= -MT${.TARGET}
|
||||
.if !defined(_meta_filemon)
|
||||
.if defined(.PARSEDIR)
|
||||
.if !empty(DEPEND_CFLAGS)
|
||||
# Only add in DEPEND_CFLAGS for CFLAGS on files we expect from DEPENDOBJS
|
||||
# as those are the only ones we will include.
|
||||
DEPEND_CFLAGS_CONDITION= "${DEPENDOBJS:${DEPEND_FILTER}:M${.TARGET:${DEPEND_FILTER}}}" != ""
|
||||
CFLAGS+= ${${DEPEND_CFLAGS_CONDITION}:?${DEPEND_CFLAGS}:}
|
||||
.else
|
||||
CFLAGS+= ${DEPEND_CFLAGS}
|
||||
.endif
|
||||
.for __depend_obj in ${DEPENDFILES_OBJS}
|
||||
.if ${MAKE_VERSION} < 20160220
|
||||
|
@ -232,13 +232,11 @@ ${DEPENDOBJS}: .NOMETA
|
||||
DEPEND_CFLAGS+= -MD ${DEPEND_MP} -MF.depend.${.TARGET}
|
||||
DEPEND_CFLAGS+= -MT${.TARGET}
|
||||
.if !defined(_meta_filemon)
|
||||
.if defined(.PARSEDIR)
|
||||
.if !empty(DEPEND_CFLAGS)
|
||||
# Only add in DEPEND_CFLAGS for CFLAGS on files we expect from DEPENDOBJS
|
||||
# as those are the only ones we will include.
|
||||
DEPEND_CFLAGS_CONDITION= "${DEPENDOBJS:M${.TARGET}}" != ""
|
||||
CFLAGS+= ${${DEPEND_CFLAGS_CONDITION}:?${DEPEND_CFLAGS}:}
|
||||
.else
|
||||
CFLAGS+= ${DEPEND_CFLAGS}
|
||||
.endif
|
||||
.for __depend_obj in ${DEPENDFILES_OBJS}
|
||||
.if ${MAKE_VERSION} < 20160220
|
||||
|
Loading…
Reference in New Issue
Block a user