Author: bdrewery
Date: Mon Jan 25 17:40:53 2016
New Revision: 294739
URL: https://svnweb.freebsd.org/changeset/base/294739
Log:
Fix mismerge in r294738. No MK_FAST_DEPEND on stable/9
Modified:
stable/9/share/mk/bsd.dep.mk
Modified: stable/9/share/mk/bsd.dep.mk
==============================================================================
--- stable/9/share/mk/bsd.dep.mk Mon Jan 25 17:39:59 2016
(r294738)
+++ stable/9/share/mk/bsd.dep.mk Mon Jan 25 17:40:53 2016
(r294739)
@@ -126,7 +126,6 @@ depend: beforedepend ${DEPENDFILE} after
# Tell bmake not to look for generated files via .PATH
.NOPATH: ${DEPENDFILE}
-.if ${MK_FAST_DEPEND} == "no"
# Capture -include from CFLAGS.
# This could be simpler with bmake :tW but needs to support fmake for MFC.
_CFLAGS_INCLUDES= ${CFLAGS:Q:S/\\ /,/g:C/-include,/-include%/g:C/,/
/g:M-include*:C/%/ /g}
@@ -146,7 +145,6 @@ MKDEP_CFLAGS= ${CFLAGS:M-nostdinc*} ${CF
MKDEP_CXXFLAGS= ${CXXFLAGS:M-nostdinc*} ${CXXFLAGS:M-[BIDU]*} \
${CXXFLAGS:M-std=*} ${CXXFLAGS:M-ansi} ${CXXFLAGS:M-stdlib=*} \
${_CXXFLAGS_INCLUDES}
-.endif # ${MK_FAST_DEPEND} == "no"
DPSRCS+= ${SRCS}
${DEPENDFILE}: ${DPSRCS}
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
