From owner-svn-src-projects@freebsd.org  Mon Oct 30 10:08:54 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 906D5E59258
 for <svn-src-projects@mailman.ysv.freebsd.org>;
 Mon, 30 Oct 2017 10:08:54 +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 6009B80F22;
 Mon, 30 Oct 2017 10:08:54 +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 v9UA8rN0091536;
 Mon, 30 Oct 2017 10:08:53 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9UA8rHd091534;
 Mon, 30 Oct 2017 10:08:53 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201710301008.v9UA8rHd091534@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, 30 Oct 2017 10:08:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r325146 - 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: 325146
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, 30 Oct 2017 10:08:54 -0000

Author: ngie
Date: Mon Oct 30 10:08:53 2017
New Revision: 325146
URL: https://svnweb.freebsd.org/changeset/base/325146

Log:
  Throwing something else at the wall, seeing if it will stick

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

Modified: projects/runtime-coverage/share/mk/bsd.lib.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.lib.mk	Mon Oct 30 09:49:01 2017	(r325145)
+++ projects/runtime-coverage/share/mk/bsd.lib.mk	Mon Oct 30 10:08:53 2017	(r325146)
@@ -3,6 +3,7 @@
 #
 
 .include <bsd.init.mk>
+.include <bsd.compiler.mk>
 
 .if defined(LIB_CXX) || defined(SHLIB_CXX)
 _LD=	${CXX}
@@ -75,8 +76,8 @@ CXXFLAGS+= ${DEBUG_FILES_CFLAGS}
 CTFFLAGS+= -g
 _WANTS_DEBUG=
 .endif
-.if defined(_WANTS_DEBUG) && ${MK_COVERAGE} != "no" && defined(SHLIB_NAME)
-.warning "_COV_FLAG set"
+.if defined(_WANTS_DEBUG) && ${MK_COVERAGE} != "no" && defined(SHLIB_NAME) && \
+    ${COMPILER_FEATURES:Mc++11}
 _COV_FLAG= --coverage -fprofile-dir=${COVERAGEDIR}
 SHARED_CFLAGS+= ${_COV_FLAG}
 SHARED_CXXFLAGS+= ${_COV_FLAG}

Modified: projects/runtime-coverage/share/mk/bsd.prog.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.prog.mk	Mon Oct 30 09:49:01 2017	(r325145)
+++ projects/runtime-coverage/share/mk/bsd.prog.mk	Mon Oct 30 10:08:53 2017	(r325146)
@@ -61,7 +61,7 @@ TAG_ARGS=	-T ${TAGS:[*]:S/ /,/g}
 .if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO")
 LDFLAGS+= -static
 .else
-.if defined(_WANTS_DEBUG) && ${MK_COVERAGE} != "no"
+.if defined(_WANTS_DEBUG) && ${MK_COVERAGE} != "no" && ${COMPILER_FEATURES:Mc++11}
 _COV_FLAG= --coverage -fprofile-dir=${COVERAGEDIR}
 CFLAGS+= ${_COV_FLAG}
 CXXFLAGS+= ${_COV_FLAG}