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 /share/mk/bsd.prog.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 'share/mk/bsd.prog.mk')
| -rw-r--r-- | share/mk/bsd.prog.mk | 6 |
1 files changed, 3 insertions, 3 deletions
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 |