diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2011-11-30 18:11:49 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2011-11-30 18:11:49 +0000 |
| commit | 83cb5bae966d79da4a1622931b6dfc991698e4fd (patch) | |
| tree | e7bc9d0ec67f981a8d35e2396651684c9133d959 /sys/conf/kern.pre.mk | |
| parent | 019bd1397739908ac31b51e282679b457faa5b0b (diff) | |
| download | src-83cb5bae966d79da4a1622931b6dfc991698e4fd.tar.gz src-83cb5bae966d79da4a1622931b6dfc991698e4fd.zip | |
- 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
Notes
Notes:
svn path=/head/; revision=228158
Diffstat (limited to 'sys/conf/kern.pre.mk')
| -rw-r--r-- | sys/conf/kern.pre.mk | 6 |
1 files changed, 4 insertions, 2 deletions
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} |