From 7d184288717893d0b477ef3ca74b465dc38f9203 Mon Sep 17 00:00:00 2001
From: bdrewery <bdrewery@FreeBSD.org>
Date: Fri, 11 Mar 2016 04:17:39 +0000
Subject: 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
---
 lib/clang/clang.build.mk | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'lib/clang')

diff --git a/lib/clang/clang.build.mk b/lib/clang/clang.build.mk
index 8ab2399..5a3d169 100644
--- a/lib/clang/clang.build.mk
+++ b/lib/clang/clang.build.mk
@@ -240,11 +240,15 @@ Checkers.inc.h: ${CLANG_SRCS}/lib/StaticAnalyzer/Checkers/Checkers.td
 	    -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/}
-- 
cgit v1.1