Revert r274200. Implicitly setting DEBUG_FLAGS when WITH_CTF is true is

not the right way to do this.

Requested by:	kan

diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index c6b689d84c61c5f496cdcfd7262f257dfde24d20..f0acf16772d3cddbbc66959bb67dfaba7c0b5393 100644 (file)
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -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

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 1e2344f2dd2918670284e27d5e0cc8d59a58d97a..486914bc19bf51c1e070cabe3bc127ab32addc21 100644 (file)
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -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

diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index e4f71045ab215f8d2c1cad0c2de541f2d01be460..340950a3cdd2c89d6481ed78a6c80701788f6af2 100644 (file)
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -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