d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix -include .depend hack from r294370 for headers not in .PATH.

Browse Source 
This hack will be removed in a few weeks.  It is here to fix incremental
builds of SSH between r291941 and r294370.

Reported by:	jmallett
MFC after:	1 day
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2016-01-28 18:57:47 +00:00
parent db7cfc199e
commit 2cf60b3ce2
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
share/mk/bsd.dep.mk
View File

@ -206,12 +206,13 @@ depend: beforedepend ${DEPENDFILE} afterdepend
_CFLAGS_INCLUDES= ${CFLAGS:Q:S/\\ /,/g:C/-include,/-include%/g:C/,/ /g:M-include*:C/%/ /g} _CFLAGS_INCLUDES= ${CFLAGS:Q:S/\\ /,/g:C/-include,/-include%/g:C/,/ /g:M-include*:C/%/ /g}
_CXXFLAGS_INCLUDES= ${CXXFLAGS:Q:S/\\ /,/g:C/-include,/-include%/g:C/,/ /g:M-include*:C/%/ /g} _CXXFLAGS_INCLUDES= ${CXXFLAGS:Q:S/\\ /,/g:C/-include,/-include%/g:C/,/ /g:M-include*:C/%/ /g}
# XXX: Temporary hack to workaround .depend files not tracking -include # XXX: Temporary hack to workaround .depend files not tracking -include
.if !empty(_CFLAGS_INCLUDES) _hdrincludes=${_CFLAGS_INCLUDES:M*.h} ${_CXXFLAGS_INCLUDES:M*.h}
${OBJS} ${POBJS} ${SOBJS}: ${_CFLAGS_INCLUDES:M*.h} .for _hdr in ${_hdrincludes:O:u}
.endif .if exists(${_hdr})
.if !empty(_CXXFLAGS_INCLUDES) ${OBJS} ${POBJS} ${SOBJS}: ${_hdr}
${OBJS} ${POBJS} ${SOBJS}: ${_CXXFLAGS_INCLUDES:M*.h}
.endif .endif
.endfor
.undef _hdrincludes
# Different types of sources are compiled with slightly different flags. # Different types of sources are compiled with slightly different flags.
# Split up the sources, and filter out headers and non-applicable flags. # Split up the sources, and filter out headers and non-applicable flags.