diff options
| -rw-r--r-- | Makefile.inc1 | 2 | ||||
| -rw-r--r-- | share/mk/bsd.lib.mk | 4 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 17 | ||||
| -rw-r--r-- | share/mk/bsd.prog.mk | 6 | ||||
| -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 |
7 files changed, 23 insertions, 18 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 00bace3ab5b0..c0ada42cbeed 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -59,8 +59,6 @@ SUBDIR+=games .endif .if ${MK_CDDL} != "no" SUBDIR+=cddl -.else -NO_CTF=1 .endif SUBDIR+=gnu include .if ${MK_KERBEROS} != "no" diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index a575536a4ae7..1e4392185970 100644 --- 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 defined(WITH_CTF) && (${DEBUG_FLAGS:M-g} != "") +.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" CTFFLAGS+= -g .endif .endif @@ -186,7 +186,7 @@ ${SHLIB_NAME}: ${SOBJS} -o ${.TARGET} -Wl,-soname,${SONAME} \ `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD} .endif -.if defined(WITH_CTF) +.if ${MK_CTF} != "no" ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS} .endif .endif diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index fe580a34ff51..55234e15f800 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -189,12 +189,6 @@ STRIP?= -s COMPRESS_CMD?= gzip -cn COMPRESS_EXT?= .gz -.if defined(WITH_CTF) -CTFCONVERT_CMD= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} -.else -CTFCONVERT_CMD= @: -.endif - .if !defined(_WITHOUT_SRCCONF) # # Define MK_* variables (which are either "yes" or "no") for users @@ -209,6 +203,7 @@ CTFCONVERT_CMD= @: # regardless of user's setting). # .for var in \ + CTF \ INSTALLLIB \ MAN \ PROFILE @@ -418,6 +413,7 @@ __DEFAULT_NO_OPTIONS = \ BIND_LIBS \ BIND_SIGCHASE \ BIND_XML \ + CTF \ HESIOD \ ICONV \ IDEA \ @@ -516,6 +512,7 @@ MK_BIND_ETC:= no .if ${MK_CDDL} == "no" MK_ZFS:= no +MK_CTF:= no .endif .if ${MK_CRYPT} == "no" @@ -616,6 +613,14 @@ MK_${vv:H}:= ${MK_${vv:T}} .endif .endfor +.if ${MK_CTF} != "no" +CTFCONVERT_CMD= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} +.elif ${MAKE_VERSION} >= 5201111300 +CTFCONVERT_CMD= +.else +CTFCONVERT_CMD= @: +.endif + .endif # !_WITHOUT_SRCCONF .endif # !target(__<bsd.own.mk>__) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index f9801b067579..fae8366f24a7 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -19,7 +19,7 @@ NO_WERROR= CFLAGS+=${DEBUG_FLAGS} CXXFLAGS+=${DEBUG_FLAGS} -.if defined(WITH_CTF) && (${DEBUG_FLAGS:M-g} != "") +.if ${MK_CTF} != "no" && ${DEBUG_FLAGS:M-g} != "" CTFFLAGS+= -g .endif .endif @@ -55,7 +55,7 @@ ${PROG}: ${OBJS} .else ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} .endif -.if defined(WITH_CTF) +.if ${MK_CTF} != "no" ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} .endif @@ -85,7 +85,7 @@ ${PROG}: ${OBJS} .else ${CC} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD} .endif -.if defined(WITH_CTF) +.if ${MK_CTF} != "no" ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS} .endif .endif diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk index 330ac49c93de..2a89294bd159 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 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} diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index 3da44af34a6a..34b85049996d 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) |