svn commit: r325678 - in head/lib/clang: libclang libllvm

[Bryan Drewery]

Author: bdrewery
Date: Fri Nov 10 20:09:15 2017
New Revision: 325678
URL: https://svnweb.freebsd.org/changeset/base/325678

Log:
  Tell bsd.dep.mk which depend files to dinclude.
  
  This allows the _SKIP_DEPEND optimization to work, avoiding reading
  the files when not needed.  It also fixes META_MODE incorrectly
  reading these files when not needed.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/lib/clang/libclang/Makefile
  head/lib/clang/libllvm/Makefile

Modified: head/lib/clang/libclang/Makefile
==============================================================================
--- head/lib/clang/libclang/Makefile	Fri Nov 10 20:09:11 2017	(r325677)
+++ head/lib/clang/libclang/Makefile	Fri Nov 10 20:09:15 2017	(r325678)
@@ -790,16 +790,7 @@ clang/StaticAnalyzer/Checkers/Checkers.inc: \
 	    ${CLANG_SRCS}/include/clang/StaticAnalyzer/Checkers/Checkers.td
 TGHDRS+=	clang/StaticAnalyzer/Checkers/Checkers.inc
 
-.for dep in ${TGHDRS:C/$/.d/}
-. if ${MAKE_VERSION} < 20160220
-.  if !make(depend)
-.   sinclude "${dep}"
-.  endif
-. else
-.   dinclude "${dep}"
-. endif
-.endfor
-
+DEPENDFILES+=	${TGHDRS:C/$/.d/}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}
 

Modified: head/lib/clang/libllvm/Makefile
==============================================================================
--- head/lib/clang/libllvm/Makefile	Fri Nov 10 20:09:11 2017	(r325677)
+++ head/lib/clang/libllvm/Makefile	Fri Nov 10 20:09:15 2017	(r325678)
@@ -1412,16 +1412,7 @@ TGHDRS+=	X86GenRegisterBank.inc
 TGHDRS+=	X86GenRegisterInfo.inc
 TGHDRS+=	X86GenSubtargetInfo.inc
 
-.for dep in ${TGHDRS:C/$/.d/}
-. if ${MAKE_VERSION} < 20160220
-.  if !make(depend)
-.   sinclude "${dep}"
-.  endif
-. else
-.   dinclude "${dep}"
-. endif
-.endfor
-
+DEPENDFILES+=	${TGHDRS:C/$/.d/}
 DPSRCS+=	${TGHDRS}
 CLEANFILES+=	${TGHDRS} ${TGHDRS:C/$/.d/}