diff options
| author | fjoe <fjoe@FreeBSD.org> | 2011-11-30 18:11:49 +0000 |
|---|---|---|
| committer | fjoe <fjoe@FreeBSD.org> | 2011-11-30 18:11:49 +0000 |
| commit | f4904d54c66224509faadc55ae5e3461bb545466 (patch) | |
| tree | e7bc9d0ec67f981a8d35e2396651684c9133d959 /sys/conf | |
| parent | 6f481b1357f44382da85a9659995c4360955127f (diff) | |
| download | FreeBSD-src-f4904d54c66224509faadc55ae5e3461bb545466.zip FreeBSD-src-f4904d54c66224509faadc55ae5e3461bb545466.tar.gz | |
- 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
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/kern.post.mk | 4 | ||||
| -rw-r--r-- | sys/conf/kern.pre.mk | 6 | ||||
| -rw-r--r-- | sys/conf/kmod.mk | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 330ac49..2a89294 100644 --- a/sys/conf/kern.post.mk +++ b/sys/conf/kern.post.mk @@ -94,7 +94,7 @@ ${FULLKERNEL}: ${SYSTEM_DEP} vers.o @rm -f ${.TARGET} @echo linking ${.TARGET} ${SYSTEM_LD} -.if defined(WITH_CTF) +.if ${MK_CTF} != "no" ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o .endif .if !defined(DEBUG) @@ -249,7 +249,7 @@ kernel-reinstall: config.o env.o hints.o vers.o vnode_if.o: ${NORMAL_C} - @${NORMAL_CTFCONVERT} + ${NORMAL_CTFCONVERT} config.ln env.ln hints.ln vers.ln vnode_if.ln: ${NORMAL_LINT} diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 59df9e2..6fff65c 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} diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 3da44af..34b8504 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -201,7 +201,7 @@ ${KMOD}.kld: ${OBJS} ${FULLPROG}: ${OBJS} .endif ${LD} ${LDFLAGS} -r -d -o ${.TARGET} ${OBJS} -.if defined(WITH_CTF) +.if ${MK_CTF} != "no" ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} .endif .if defined(EXPORT_SYMS) |
