From owner-svn-src-projects@freebsd.org  Mon Oct  9 01:17:13 2017
Return-Path: <owner-svn-src-projects@freebsd.org>
Delivered-To: svn-src-projects@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A7841E44D6B
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon,  9 Oct 2017 01:17:13 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 68A7913E1;
 Mon,  9 Oct 2017 01:17:13 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v991HC4c086104;
 Mon, 9 Oct 2017 01:17:12 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v991HCrr086102;
 Mon, 9 Oct 2017 01:17:12 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201710090117.v991HCrr086102@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Ngie Cooper <ngie@FreeBSD.org>
Date: Mon, 9 Oct 2017 01:17:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r324421 - in projects/runtime-coverage: . share/mk
X-SVN-Group: projects
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: in projects/runtime-coverage: . share/mk
X-SVN-Commit-Revision: 324421
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Oct 2017 01:17:13 -0000

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@r273449
  
  Unlike ^/head@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 \