From owner-svn-src-projects@freebsd.org  Mon Oct  9 16:27:33 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 0C2DDE356EE
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon,  9 Oct 2017 16:27:33 +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 7C6E4664C5;
 Mon,  9 Oct 2017 16:27:32 +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 v99GRVfX063665;
 Mon, 9 Oct 2017 16:27:31 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v99GRVRF063664;
 Mon, 9 Oct 2017 16:27:31 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201710091627.v99GRVRF063664@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 16:27:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r324440 - projects/runtime-coverage
X-SVN-Group: projects
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: projects/runtime-coverage
X-SVN-Commit-Revision: 324440
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 16:27:33 -0000

Author: ngie
Date: Mon Oct  9 16:27:31 2017
New Revision: 324440
URL: https://svnweb.freebsd.org/changeset/base/324440

Log:
  First attempt at adding coverage libraries for gcc-only platforms
  
  gnu/lib/libgcov is needed for gcc --coverage , whereas libprofile-rt is
  required for clang --coverage .
  
  Adopt a pattern similar to SUBDIR.yes for handling both the clang and gcc cases.

Modified:
  projects/runtime-coverage/Makefile.inc1

Modified: projects/runtime-coverage/Makefile.inc1
==============================================================================
--- projects/runtime-coverage/Makefile.inc1	Mon Oct  9 16:20:39 2017	(r324439)
+++ projects/runtime-coverage/Makefile.inc1	Mon Oct  9 16:27:31 2017	(r324440)
@@ -2080,11 +2080,11 @@ _lld=		usr.bin/clang/lld
 .if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_LLD_BOOTSTRAP} != "no"
 _clang_libs=	lib/clang
 .endif
+
 .if ${MK_COVERAGE_SUPPORT} != "no"
-.if ${MK_CLANG} != "no"
-_coverage_libs= lib/libclang_rt/profile
+_coverage_libs.${MK_CLANG}+=	lib/libclang_rt/profile
+_coverage_lib.${MK_GCC}+=	gnu/lib/libgcov
 .endif
-.endif
 
 .if ${MK_GCC_BOOTSTRAP} != "no"
 _gcc=		gnu/usr.bin/cc
@@ -2097,7 +2097,7 @@ cross-tools: .MAKE .PHONY
 .for _tool in \
     ${LOCAL_XTOOL_DIRS} \
     ${_clang_libs} \
-    ${_coverage_libs} \
+    ${_coverage_libs.yes} \
     ${_clang} \
     ${_lld} \
     ${_binutils} \