svn commit: r295006 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Thu Jan 28 18:57:47 2016
New Revision: 295006
URL: https://svnweb.freebsd.org/changeset/base/295006

Log:
  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

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

Modified: head/share/mk/bsd.dep.mk
==============================================================================
--- head/share/mk/bsd.dep.mk	Thu Jan 28 18:45:09 2016	(r295005)
+++ head/share/mk/bsd.dep.mk	Thu Jan 28 18:57:47 2016	(r295006)
@@ -206,12 +206,13 @@ depend: beforedepend ${DEPENDFILE} after
 _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.