Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 8 Nov 2014 18:16:39 +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: r274299 - head/share/mk
Message-ID:  <201411081816.sA8IGdJI052612@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: markj
Date: Sat Nov  8 18:16:39 2014
New Revision: 274299
URL: https://svnweb.freebsd.org/changeset/base/274299

Log:
  Revert r274200. Implicitly setting DEBUG_FLAGS when WITH_CTF is true is
  not the right way to do this.
  
  Requested by:	kan

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	Sat Nov  8 18:13:35 2014	(r274298)
+++ head/share/mk/bsd.lib.mk	Sat Nov  8 18:16:39 2014	(r274299)
@@ -36,7 +36,7 @@ NO_WERROR=
 .if defined(DEBUG_FLAGS)
 CFLAGS+= ${DEBUG_FLAGS}
 
-.if ${MK_CTF} != "no"
+.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
 CTFFLAGS+= -g
 .endif
 .else

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Sat Nov  8 18:13:35 2014	(r274298)
+++ head/share/mk/bsd.own.mk	Sat Nov  8 18:16:39 2014	(r274299)
@@ -128,7 +128,6 @@ __<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	Sat Nov  8 18:13:35 2014	(r274298)
+++ head/share/mk/bsd.prog.mk	Sat Nov  8 18:16:39 2014	(r274299)
@@ -20,7 +20,7 @@ NO_WERROR=
 CFLAGS+=${DEBUG_FLAGS}
 CXXFLAGS+=${DEBUG_FLAGS}
 
-.if ${MK_CTF} != "no"
+.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != ""
 CTFFLAGS+= -g
 .endif
 .endif

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411081816.sA8IGdJI052612>