From 83cb5bae966d79da4a1622931b6dfc991698e4fd Mon Sep 17 00:00:00 2001
From: Max Khon <fjoe@FreeBSD.org>
Date: Wed, 30 Nov 2011 18:11:49 +0000
Subject: - CTF knob is now implemented using common scheme: MK_CTF=yes/no is
 defined based on WITH/WITHOUT_CTF settings, default is WITHOUT_CTF, NO_CTF
 overrides WITH_CTF (used by Makefile.inc1) - CTFCONVERT_CMD/NORMAL_CTFCONVERT
 are now defined to empty string if make(1) can handle empty commands

---
 sys/conf/kern.pre.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'sys/conf/kern.pre.mk')

diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk
index 59df9e2bba99..6fff65c1b824 100644
--- a/sys/conf/kern.pre.mk
+++ b/sys/conf/kern.pre.mk
@@ -123,10 +123,12 @@ NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
 NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
 	  ${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
 
-.if defined(WITH_CTF)
+.if ${MK_CTF} != "no"
 NORMAL_CTFCONVERT=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.elif ${MAKE_VERSION} >= 5201111300
+NORMAL_CTFCONVERT=
 .else
-NORMAL_CTFCONVERT=	:
+NORMAL_CTFCONVERT=	@:
 .endif
 
 NORMAL_LINT=	${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC}
-- 
cgit v1.2.3