Date: Thu, 6 Nov 2014 22:46:40 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274200 - head/share/mk Message-ID: <201411062246.sA6MkeLN018716@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Thu Nov 6 22:46:40 2014 New Revision: 274200 URL: https://svnweb.freebsd.org/changeset/base/274200 Log: Automatically build with debug symbols when building with WITH_CTF. Otherwise there's nothing for ctfconvert to do, and it ends up emitting an error for each object file. Also remove some redundant checks from bsd.prog.mk and bsd.lib.mk. Differential Revision: https://reviews.freebsd.org/D1111 Reviewed by: imp Modified: head/share/mk/bsd.lib.mk head/share/mk/bsd.own.mk head/share/mk/bsd.prog.mk Modified: head/share/mk/bsd.lib.mk ============================================================================== --- head/share/mk/bsd.lib.mk Thu Nov 6 22:45:03 2014 (r274199) +++ head/share/mk/bsd.lib.mk Thu Nov 6 22:46:40 2014 (r274200) @@ -36,7 +36,7 @@ NO_WERROR= .if defined(DEBUG_FLAGS) CFLAGS+= ${DEBUG_FLAGS} -.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" +.if ${MK_CTF} != "no" CTFFLAGS+= -g .endif .else Modified: head/share/mk/bsd.own.mk ============================================================================== --- head/share/mk/bsd.own.mk Thu Nov 6 22:45:03 2014 (r274199) +++ head/share/mk/bsd.own.mk Thu Nov 6 22:46:40 2014 (r274200) @@ -128,6 +128,7 @@ __<bsd.own.mk>__: .if ${MK_CTF} != "no" CTFCONVERT_CMD= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +DEBUG_FLAGS+= -g .elif defined(.PARSEDIR) || (defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300) CTFCONVERT_CMD= .else Modified: head/share/mk/bsd.prog.mk ============================================================================== --- head/share/mk/bsd.prog.mk Thu Nov 6 22:45:03 2014 (r274199) +++ head/share/mk/bsd.prog.mk Thu Nov 6 22:46:40 2014 (r274200) @@ -20,7 +20,7 @@ NO_WERROR= CFLAGS+=${DEBUG_FLAGS} CXXFLAGS+=${DEBUG_FLAGS} -.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" +.if ${MK_CTF} != "no" CTFFLAGS+= -g .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411062246.sA6MkeLN018716>