From owner-svn-src-projects@freebsd.org  Mon Jul 31 20:28:27 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 D5F97DBCDF8
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon, 31 Jul 2017 20:28:27 +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 A561A673BF;
 Mon, 31 Jul 2017 20:28:27 +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 v6VKSQnm023522;
 Mon, 31 Jul 2017 20:28:26 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6VKSQde023521;
 Mon, 31 Jul 2017 20:28:26 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201707312028.v6VKSQde023521@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, 31 Jul 2017 20:28:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r321815 - projects/runtime-coverage/share/mk
X-SVN-Group: projects
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: projects/runtime-coverage/share/mk
X-SVN-Commit-Revision: 321815
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, 31 Jul 2017 20:28:27 -0000

Author: ngie
Date: Mon Jul 31 20:28:26 2017
New Revision: 321815
URL: https://svnweb.freebsd.org/changeset/base/321815

Log:
  - Check CXXFLAGS as well for -g options before writing off --coverage support
    to enable c++ program runtime coverage instrumentation.
  - Pass --coverage down through LDFLAGS to ensure that libprofile_rt is used in
    the linking phase, for reasons similar to what I did with SOLINKOPTS in
    bsd.lib.mk@r321778.

Modified:
  projects/runtime-coverage/share/mk/bsd.prog.mk

Modified: projects/runtime-coverage/share/mk/bsd.prog.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.prog.mk	Mon Jul 31 20:15:11 2017	(r321814)
+++ projects/runtime-coverage/share/mk/bsd.prog.mk	Mon Jul 31 20:28:26 2017	(r321815)
@@ -43,10 +43,12 @@ CFLAGS+= -g
 CXXFLAGS+= -g
 CTFFLAGS+= -g
 .endif
-.if ${MK_COVERAGE} != "no" && ${CFLAGS:M-g*} != ""
+.if ${MK_COVERAGE} != "no" && \
+    (${CFLAGS:M-g*} != "" || ${CXXFLAGS:M-g*})
 _COV_FLAG= --coverage
 CFLAGS+= ${_COV_FLAG}
 CXXFLAGS+= ${_COV_FLAG}
+LDFLAGS+= ${_COV_FLAG}
 .endif
 .endif