diff options
author | bdrewery <bdrewery@FreeBSD.org> | 2016-01-29 17:33:37 +0000 |
---|---|---|
committer | bdrewery <bdrewery@FreeBSD.org> | 2016-01-29 17:33:37 +0000 |
commit | 743220b75c8b5edb42fc06923597ff3954b02e80 (patch) | |
tree | d5e5d5084e95c9debc5be608048494324800f13b | |
parent | 21ca5dcc62369da75a40c997c67822d570aad5a6 (diff) | |
download | FreeBSD-src-743220b75c8b5edb42fc06923597ff3954b02e80.zip FreeBSD-src-743220b75c8b5edb42fc06923597ff3954b02e80.tar.gz |
MFC r295006:
Fix -include .depend hack from r294370 for headers not in .PATH.
Approved by: re (gjb)
-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 3e49a6e..5dc79a8 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -165,12 +165,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. |