svn commit: r324421 - in projects/runtime-coverage: . share/mk

[Ngie Cooper]

Author: ngie
Date: Mon Oct  9 01:17:12 2017
New Revision: 324421
URL: https://svnweb.freebsd.org/changeset/base/324421

Log:
  Add MK_COVERAGE_SUPPORT
  
  This is being done for reasons parallel to MK_TESTS_SUPPORT's addition in
  ^/head at r273449
  
  Unlike ^/head at r273449 though, we do want binaries to be built with coverage
  support in the libraries phase, but not in the cross-tools phase.

Modified:
  projects/runtime-coverage/Makefile.inc1
  projects/runtime-coverage/share/mk/src.opts.mk

Modified: projects/runtime-coverage/Makefile.inc1
==============================================================================
--- projects/runtime-coverage/Makefile.inc1	Sun Oct  8 22:17:39 2017	(r324420)
+++ projects/runtime-coverage/Makefile.inc1	Mon Oct  9 01:17:12 2017	(r324421)
@@ -558,7 +558,8 @@ TMAKE=		MAKEOBJDIRPREFIX=${OBJTREE} \
 # cross-tools stage
 XMAKE=		TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \
 		TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
-		MK_GDB=no MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no
+		MK_COVERAGE_SUPPORT=${MK_COVERAGE} MK_GDB=no \
+		MK_LLD_IS_LD=${MK_LLD_BOOTSTRAP} MK_TESTS=no
 
 # kernel-tools stage
 KTMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
@@ -2079,8 +2080,8 @@ _lld=		usr.bin/clang/lld
 .if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_LLD_BOOTSTRAP} != "no"
 _clang_libs=	lib/clang
 .endif
-.if ${MK_COVERAGE} != "no"
-.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no"
+.if ${MK_COVERAGE_SUPPORT} != "no"
+.if ${MK_CLANG} != "no"
 _coverage_libs= lib/libclang_rt/profile
 .endif
 .endif

Modified: projects/runtime-coverage/share/mk/src.opts.mk
==============================================================================
--- projects/runtime-coverage/share/mk/src.opts.mk	Sun Oct  8 22:17:39 2017	(r324420)
+++ projects/runtime-coverage/share/mk/src.opts.mk	Mon Oct  9 01:17:12 2017	(r324421)
@@ -449,6 +449,7 @@ MK_${vv:H}:=	${MK_${vv:T}}
 .for var in \
     BLACKLIST \
     BZIP2 \
+    COVERAGE \
     INET \
     INET6 \
     KERBEROS \