svn commit: r248476 - projects/bmake/share/mk

[Simon J. Gerraty]

Author: sjg
Date: Mon Mar 18 21:29:31 2013
New Revision: 248476
URL: http://svnweb.freebsd.org/changeset/base/248476

Log:
  Revert the dance for skipping machine qualified dependfile.
  We just note when using non-machine qualified dependfile for "host"
  and skip update.

Modified:
  projects/bmake/share/mk/gendirdeps.mk

Modified: projects/bmake/share/mk/gendirdeps.mk
==============================================================================
--- projects/bmake/share/mk/gendirdeps.mk	Mon Mar 18 21:11:31 2013	(r248475)
+++ projects/bmake/share/mk/gendirdeps.mk	Mon Mar 18 21:29:31 2013	(r248476)
@@ -281,10 +281,6 @@ CAT_DEPEND ?= .depend
 # .depend may contain things we don't want.
 # The sed command at the end of the stream, allows for the filters
 # to output _{VAR} tokens which we will turn into proper ${VAR} references.
-# Note: if we have a non-machine qualified .MAKE.DEPENDFILE_DEFAULT
-# which exists and _DEPENDFILE does not yet and is machine qualified;
-# compare new _DEPENDFILE to default and if they are the same we do
-# not need _DEPENDFILE.
 ${_DEPENDFILE}: ${CAT_DEPEND:M.depend} ${META_FILES:O:u:@m@${exists($m):?$m:}@} ${_this} ${META2DEPS}
 	@(echo '# Autogenerated - do NOT edit!'; echo; \
 	echo 'DEP_RELDIR := $${_PARSEDIR:S,$${SRCTOP}/,,}'; echo; \
@@ -297,9 +293,6 @@ ${_DEPENDFILE}: ${CAT_DEPEND:M.depend} $
 	echo '# local dependencies - needed for -jN in clean tree'; \
 	[ -s ${CAT_DEPEND} ] && { grep : ${CAT_DEPEND} | grep -v '[/\\]'; }; \
 	echo '.endif' ) | sed 's,_\([{(]\),$$\1,g' > $@.new${.MAKE.PID}
-.if ${.MAKE.DEPENDFILE_DEFAULT:E} != ${MACHINE} && ${@:E} == ${MACHINE} && !exists($@) && exists(${@:H}/${.MAKE.DEPENDFILE_DEFAULT:T})
-	@cmp -s ${@:H}/${.MAKE.DEPENDFILE_DEFAULT:T} $@.new${.MAKE.PID} && rm $@.new${.MAKE.PID}; :
-.endif
 	@${InstallNew}; InstallNew -s $@.new${.MAKE.PID}
 
 .endif				# meta2deps failed