svn commit: r324861 - projects/runtime-coverage/share/mk
Ngie Cooper
ngie at FreeBSD.org
Sun Oct 22 11:45:52 UTC 2017
Author: ngie
Date: Sun Oct 22 11:45:51 2017
New Revision: 324861
URL: https://svnweb.freebsd.org/changeset/base/324861
Log:
Only try handling mutating GCNOS if SRCS is not empty
This should cure the logspam in certain directory about SRCS:M not evaluating
properly, e.g., etc/
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 Sun Oct 22 11:40:55 2017 (r324860)
+++ projects/runtime-coverage/share/mk/bsd.lib.mk Sun Oct 22 11:45:51 2017 (r324861)
@@ -458,7 +458,7 @@ _libinstall:
.if !defined(LIBRARIES_ONLY)
.include <bsd.nls.mk>
-.if defined(_COV_FLAG)
+.if defined(_COV_FLAG) && !empty(SRCS)
_GCNO_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C}
GCNOS:= ${_GCNO_SRCS:R:S/$/.gcno/g}
.undef _GCNO_SRCS
Modified: projects/runtime-coverage/share/mk/bsd.prog.mk
==============================================================================
--- projects/runtime-coverage/share/mk/bsd.prog.mk Sun Oct 22 11:40:55 2017 (r324860)
+++ projects/runtime-coverage/share/mk/bsd.prog.mk Sun Oct 22 11:45:51 2017 (r324861)
@@ -305,7 +305,7 @@ NLSNAME?= ${PROG}
.include <bsd.nls.mk>
.include <bsd.confs.mk>
-.if defined(_COV_FLAG)
+.if defined(_COV_FLAG) && !empty(SRCS)
_GCDA_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C}
GCDAS:= ${_GCDA_SRCS:R:S/$/.gcno/g}
.undef _GCDA_SRCS
More information about the svn-src-projects
mailing list