svn commit: r296647 - head/lib/clang

[Bryan Drewery]

Author: bdrewery
Date: Fri Mar 11 04:17:39 2016
New Revision: 296647
URL: https://svnweb.freebsd.org/changeset/base/296647

Log:
  Use the new bmake .dinclude feature to make these safe.
  
  At least FAST_DEPEND won't even run 'make depend', so the code was
  potentially broken with FAST_DEPEND anyhow.  The .dinclude directive
  will ignore missing files rather than make them be fatal.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/lib/clang/clang.build.mk

Modified: head/lib/clang/clang.build.mk
==============================================================================
--- head/lib/clang/clang.build.mk	Fri Mar 11 04:09:56 2016	(r296646)
+++ head/lib/clang/clang.build.mk	Fri Mar 11 04:17:39 2016	(r296647)
@@ -240,11 +240,15 @@ Checkers.inc.h: ${CLANG_SRCS}/lib/Static
 	    -I ${CLANG_SRCS}/include -d ${.TARGET:C/\.h$/.d/} -o ${.TARGET} \
 	    ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td
 
-.if !make(depend)
-. for dep in ${TGHDRS:C/$/.inc.d/}
-.  sinclude "${dep}"
-. endfor
-.endif
+.for dep in ${TGHDRS:C/$/.inc.d/}
+. if ${MAKE_VERSION} < 20160220
+.  if !make(depend)
+.   sinclude "${dep}"
+.  endif
+. else
+.   dinclude "${dep}"
+. endif
+.endfor
 
 SRCS+=		${TGHDRS:C/$/.inc.h/}
 CLEANFILES+=	${TGHDRS:C/$/.inc.h/} ${TGHDRS:C/$/.inc.d/}