svn commit: r321432 - in projects/runtime-coverage: lib/libefivar share/mk

[Ngie Cooper]

Author: ngie
Date: Mon Jul 24 18:25:08 2017
New Revision: 321432
URL: https://svnweb.freebsd.org/changeset/base/321432

Log:
  MFhead at r321431

Modified:
  projects/runtime-coverage/lib/libefivar/uefi-dputil.c
  projects/runtime-coverage/share/mk/bsd.obj.mk
  projects/runtime-coverage/share/mk/bsd.opts.mk
  projects/runtime-coverage/share/mk/bsd.progs.mk
Directory Properties:
  projects/runtime-coverage/   (props changed)

Modified: projects/runtime-coverage/lib/libefivar/uefi-dputil.c
==============================================================================
--- projects/runtime-coverage/lib/libefivar/uefi-dputil.c	Mon Jul 24 18:21:01 2017	(r321431)
+++ projects/runtime-coverage/lib/libefivar/uefi-dputil.c	Mon Jul 24 18:25:08 2017	(r321432)
@@ -42,7 +42,7 @@ __FBSDID("$FreeBSD$");
 
 #include "uefi-dplib.h"
 
-/* XXX maybe I sould include the entire DevicePathUtiltiies.c and ifdef out what we don't use */
+/* XXX maybe I should include the entire DevicePathUtiltiies.c and ifdef out what we don't use */
 
 /*
  * Taken from MdePkg/Library/UefiDevicePathLib/DevicePathUtilities.c

Modified: projects/runtime-coverage/share/mk/bsd.obj.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.obj.mk	Mon Jul 24 18:21:01 2017	(r321431)
+++ projects/runtime-coverage/share/mk/bsd.obj.mk	Mon Jul 24 18:25:08 2017	(r321432)
@@ -157,9 +157,10 @@ whereobj:
 	@echo ${.OBJDIR}
 .endif
 
+# Same check in bsd.progs.mk
 .if ${CANONICALOBJDIR} != ${.CURDIR} && exists(${CANONICALOBJDIR}/)
 cleanobj:
-	@-rm -rf ${CANONICALOBJDIR}
+	-rm -rf ${CANONICALOBJDIR}
 .else
 cleanobj: clean cleandepend
 .endif

Modified: projects/runtime-coverage/share/mk/bsd.opts.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.opts.mk	Mon Jul 24 18:21:01 2017	(r321431)
+++ projects/runtime-coverage/share/mk/bsd.opts.mk	Mon Jul 24 18:25:08 2017	(r321432)
@@ -78,6 +78,7 @@ __DEFAULT_DEPENDENT_OPTIONS = \
     COVERAGE/DEBUG_FILES \
     STAGING_MAN/STAGING \
     STAGING_PROG/STAGING \
+    STALE_STAGED/STAGING \
 
 
 .include <bsd.mkopt.mk>
@@ -100,10 +101,6 @@ __DEFAULT_DEPENDENT_OPTIONS = \
 MK_${var}:=no
 .endif
 .endfor
-
-.if ${MK_STAGING} == "no"
-MK_STALE_STAGED= no
-.endif
 
 .include <bsd.cpu.mk>
 

Modified: projects/runtime-coverage/share/mk/bsd.progs.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.progs.mk	Mon Jul 24 18:21:01 2017	(r321431)
+++ projects/runtime-coverage/share/mk/bsd.progs.mk	Mon Jul 24 18:25:08 2017	(r321432)
@@ -116,7 +116,16 @@ ${_PROGS_COMMON_OBJS}: .NOMETA
 
 .if !empty(PROGS) && !defined(_RECURSING_PROGS) && !defined(PROG)
 # tell progs.mk we might want to install things
-PROGS_TARGETS+= checkdpadd clean cleandepend cleandir depend install
+PROGS_TARGETS+= checkdpadd clean depend install
+# Only handle removing depend files from the main process.
+_PROG_MK.cleandir=	CLEANDEPENDFILES= CLEANDEPENDDIRS=
+_PROG_MK.cleanobj=	CLEANDEPENDFILES= CLEANDEPENDDIRS=
+# Only recurse on these if there is no objdir, meaning a normal
+# 'clean' gets ran via the target defined in bsd.obj.mk.
+# Same check from cleanobj: in bsd.obj.mk
+.if ${CANONICALOBJDIR} == ${.CURDIR} || !exists(${CANONICALOBJDIR}/)
+PROGS_TARGETS+=	cleandir cleanobj
+.endif
 
 # Ensure common objects are built before recursing.
 .if !empty(_PROGS_COMMON_OBJS)
@@ -142,7 +151,7 @@ $p.$t: .PHONY .MAKE
 	(cd ${.CURDIR} && \
 	    DEPENDFILE=.depend.$p \
 	    NO_SUBDIR=1 ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS=t \
-	    PROG=$p ${x.$p} ${@:E})
+	    ${_PROG_MK.${t}} PROG=$p ${x.$p} ${@:E})
 .endfor
 .endfor