Date: Thu, 17 Aug 2017 20:10:30 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r322632 - projects/runtime-coverage/share/mk Message-ID: <201708172010.v7HKAUDC014798@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Aug 17 20:10:30 2017 New Revision: 322632 URL: https://svnweb.freebsd.org/changeset/base/322632 Log: - Only pass --coverage if NO_SHARED != yes (it doesn't work with static libraries). - Fix typo (${PROGNAME}.full should be ${PROG_FULL} -- this fixes installing usr.sbin/xinstall). - Pass through appropriate sentinel for determining whether or not the program should be compiled with debug symbols, and hence whether or not --coverage should be enabled. Modified: projects/runtime-coverage/share/mk/bsd.prog.mk Modified: projects/runtime-coverage/share/mk/bsd.prog.mk ============================================================================== --- projects/runtime-coverage/share/mk/bsd.prog.mk Thu Aug 17 20:07:12 2017 (r322631) +++ projects/runtime-coverage/share/mk/bsd.prog.mk Thu Aug 17 20:10:30 2017 (r322632) @@ -37,17 +37,13 @@ MK_DEBUG_FILES= no .if defined(CRUNCH_CFLAGS) CFLAGS+=${CRUNCH_CFLAGS} .else -.if ${MK_DEBUG_FILES} != "no" && empty(DEBUG_FLAGS:M-g) && \ - empty(DEBUG_FLAGS:M-gdwarf-*) +.if ${MK_DEBUG_FILES} != "no" +.if empty(DEBUG_FLAGS:M-g) && empty(DEBUG_FLAGS:M-gdwarf-*) CFLAGS+= -g CXXFLAGS+= -g CTFFLAGS+= -g .endif -.if ${MK_COVERAGE} != "no" && \ - (${CFLAGS:M-g*} != "" || ${CXXFLAGS:M-g*}) -_COV_FLAG= --coverage -CFLAGS+= ${_COV_FLAG} -CXXFLAGS+= ${_COV_FLAG} +_WANTS_DEBUG= .endif .endif @@ -64,7 +60,13 @@ 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" +_COV_FLAG= --coverage +CFLAGS+= ${_COV_FLAG} +CXXFLAGS+= ${_COV_FLAG} .endif +.endif .if ${MK_DEBUG_FILES} != "no" PROG_FULL=${PROG}.full @@ -251,7 +253,7 @@ _proginstall: ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -d ${DESTDIR}${COVERAGEDIR}/ .endif ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},coverage} -o ${BINOWN} -g ${BINGRP} -m ${DEBUGMODE} \ - ${PROGNAME}.full ${DESTDIR}${COVERAGEDIR}/${PROGNAME} + ${PROG_FULL} ${DESTDIR}${COVERAGEDIR}/${PROGNAME} .endif .if defined(DEBUGMKDIR) ${INSTALL} ${TAG_ARGS:D${TAG_ARGS},debug} -d ${DESTDIR}${DEBUGFILEDIR}/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708172010.v7HKAUDC014798>