svn commit: r325146 - projects/runtime-coverage/share/mk

[Ngie Cooper]

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}