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 /share/mk/bsd.lib.mk | |
| 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 'share/mk/bsd.lib.mk')
| -rw-r--r-- | share/mk/bsd.lib.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index a575536..1e43921 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 |
