Date: Sun, 20 Aug 2017 07:06:13 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r322717 - projects/runtime-coverage/share/mk Message-ID: <201708200706.v7K76DkR066871@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Aug 20 07:06:13 2017 New Revision: 322717 URL: https://svnweb.freebsd.org/changeset/base/322717 Log: Need to account for SRCS that don't get compiled with --coverage, e.g., .S files Modified: projects/runtime-coverage/share/mk/bsd.cov.mk projects/runtime-coverage/share/mk/bsd.lib.mk projects/runtime-coverage/share/mk/bsd.prog.mk Modified: projects/runtime-coverage/share/mk/bsd.cov.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.cov.mk Sun Aug 20 07:04:23 2017 (r322716) +++ projects/runtime-coverage/share/mk/bsd.cov.mk Sun Aug 20 07:06:13 2017 (r322717) @@ -4,7 +4,12 @@ FILESGROUPS?= FILES -GCNOS= ${COV_OBJS:.o=.gcno} +cov_objs_no_suffixes= ${COV_OBJS:R} +.for src in ${COV_SRCS:R} +.if ${cov_objs_no_suffixes:M${src}} +GCNOS+= ${src}.gcno +.endif +.endfor .if !empty(GCNOS) GCNOS:= ${GCNOS:O:u} Modified: projects/runtime-coverage/share/mk/bsd.lib.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.lib.mk Sun Aug 20 07:04:23 2017 (r322716) +++ projects/runtime-coverage/share/mk/bsd.lib.mk Sun Aug 20 07:06:13 2017 (r322717) @@ -454,6 +454,7 @@ _libinstall: .include <bsd.nls.mk> .if defined(_COV_FLAG) COV_OBJS= ${SOBJS:.pico=.o} +COV_SRCS= ${SRCS:M*.[c|cc|cpp|cxx|C]} .include <bsd.cov.mk> .endif .include <bsd.files.mk> Modified: projects/runtime-coverage/share/mk/bsd.prog.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.prog.mk Sun Aug 20 07:04:23 2017 (r322716) +++ projects/runtime-coverage/share/mk/bsd.prog.mk Sun Aug 20 07:06:13 2017 (r322717) @@ -303,6 +303,7 @@ NLSNAME?= ${PROG} .include <bsd.confs.mk> .if defined(_COV_FLAG) COV_OBJS= ${OBJS} +COV_SRCS= ${SRCS:M*.[c|cc|cpp|cxx|C]} .include <bsd.cov.mk> .endif .include <bsd.files.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708200706.v7K76DkR066871>