Date: Sun, 1 Oct 2017 05:25:55 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r324153 - projects/runtime-coverage/share/mk Message-ID: <201710010525.v915Ptsl054575@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Oct 1 05:25:55 2017 New Revision: 324153 URL: https://svnweb.freebsd.org/changeset/base/324153 Log: Use a pattern for GCDAS that actually works 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 1 05:16:19 2017 (r324152) +++ projects/runtime-coverage/share/mk/bsd.lib.mk Sun Oct 1 05:25:55 2017 (r324153) @@ -459,7 +459,9 @@ _libinstall: .if !defined(LIBRARIES_ONLY) .include <bsd.nls.mk> .if defined(_COV_FLAG) -GCDAS= ${SRCS:M*.[c|cc|cpp|cxx|C]:R:S/$/.gcda/g} +_GCDA_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} +GCDAS= ${SRCS:R:S/$/.gcda/g} +.undef _GCDA_SRCS .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 Oct 1 05:16:19 2017 (r324152) +++ projects/runtime-coverage/share/mk/bsd.prog.mk Sun Oct 1 05:25:55 2017 (r324153) @@ -302,7 +302,9 @@ NLSNAME?= ${PROG} .include <bsd.confs.mk> .if defined(_COV_FLAG) -GCDAS= ${SRCS:M*.[c|cc|cpp|cxx|C]:R:S/$/.gcda/g} +_GCDA_SRCS= ${SRCS:M*.c} ${SRCS:M*.cc} ${SRCS:M*.cpp} ${SRCS:M*.cxx} ${SRCS:M*.C} +GCDAS= ${SRCS:R:S/$/.gcda/g} +.undef _GCDA_SRCS .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?201710010525.v915Ptsl054575>