diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-01-28 18:57:47 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-01-28 18:57:47 +0000 |
| commit | 2cf60b3ce2660556476ac00ecbecead73fb5adca (patch) | |
| tree | b39eac7d9c183e25dc9d1bfb6a3b17197443f3f7 | |
| parent | db7cfc199e950ec65b41c0af9c8cd515410ef230 (diff) | |
| download | src-2cf60b3ce2660556476ac00ecbecead73fb5adca.tar.gz src-2cf60b3ce2660556476ac00ecbecead73fb5adca.zip | |
Fix -include .depend hack from r294370 for headers not in .PATH.
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
Notes
Notes:
svn path=/head/; revision=295006
| -rw-r--r-- | share/mk/bsd.dep.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index 948f31008a71..0300e77d7e5f 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -206,12 +206,13 @@ depend: beforedepend ${DEPENDFILE} afterdepend _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} # XXX: Temporary hack to workaround .depend files not tracking -include -.if !empty(_CFLAGS_INCLUDES) -${OBJS} ${POBJS} ${SOBJS}: ${_CFLAGS_INCLUDES:M*.h} -.endif -.if !empty(_CXXFLAGS_INCLUDES) -${OBJS} ${POBJS} ${SOBJS}: ${_CXXFLAGS_INCLUDES:M*.h} +_hdrincludes=${_CFLAGS_INCLUDES:M*.h} ${_CXXFLAGS_INCLUDES:M*.h} +.for _hdr in ${_hdrincludes:O:u} +.if exists(${_hdr}) +${OBJS} ${POBJS} ${SOBJS}: ${_hdr} .endif +.endfor +.undef _hdrincludes # Different types of sources are compiled with slightly different flags. # Split up the sources, and filter out headers and non-applicable flags. |