Date: Wed, 24 Feb 2016 17:19:09 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r295986 - in head: share/mk sys/conf Message-ID: <201602241719.u1OHJ9Ro089671@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Feb 24 17:19:09 2016 New Revision: 295986 URL: https://svnweb.freebsd.org/changeset/base/295986 Log: FAST_DEPEND: Don't waste time generating an empty .depend file. The .depend file will still be generated if _EXTRADEPEND is used. The target is kept with a dependency on DPSRCS though so that 'make depend' will generate all files. Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/bsd.dep.mk head/sys/conf/kern.post.mk Modified: head/share/mk/bsd.dep.mk ============================================================================== --- head/share/mk/bsd.dep.mk Wed Feb 24 17:19:05 2016 (r295985) +++ head/share/mk/bsd.dep.mk Wed Feb 24 17:19:09 2016 (r295986) @@ -246,6 +246,8 @@ MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} .endif # ${MK_FAST_DEPEND} == "no" DPSRCS+= ${SRCS} +# FAST_DEPEND will only generate a .depend if _EXTRADEPEND is used but +# the target is created to allow 'make depend' to generate files. ${DEPENDFILE}: ${DPSRCS} .if ${MK_FAST_DEPEND} == "no" rm -f ${DEPENDFILE} @@ -260,8 +262,6 @@ ${DEPENDFILE}: ${DPSRCS} ${.ALLSRC:M*.cc} ${.ALLSRC:M*.C} ${.ALLSRC:M*.cpp} ${.ALLSRC:M*.cxx} .else .endif -.else - : > ${.TARGET} .endif # ${MK_FAST_DEPEND} == "no" .if target(_EXTRADEPEND) _EXTRADEPEND: .USE Modified: head/sys/conf/kern.post.mk ============================================================================== --- head/sys/conf/kern.post.mk Wed Feb 24 17:19:05 2016 (r295985) +++ head/sys/conf/kern.post.mk Wed Feb 24 17:19:09 2016 (r295986) @@ -278,8 +278,6 @@ ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}} ${MAKE} -V SFILES_CDDL | \ CC="${_MKDEPCC}" xargs mkdep -a -f ${.TARGET}.tmp ${ZFS_ASM_CFLAGS} mv ${.TARGET}.tmp ${.TARGET} -.else - : > ${.TARGET} .endif _ILINKS= machine
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602241719.u1OHJ9Ro089671>