misc/172440: [patch] [build] fix broken CTFCONVERT_CMD call

[Simon J. Gerraty]

On Sun, 7 Oct 2012 01:48:35 -0700, Garrett Cooper writes:
>    Correction -- bmake hates empty strings for commands too...

That's interesting.  I thought I fixed that back in May..
Ok, that was something like @${EMPTY}
This is a variant of the same thing - will fix - in make.

In the meantime, your patch, don't use WITH_BMAKE or even MK_BMAKE as a
descriminator. defined(.PARSEDIR) is a reliable means of distinguishing
bmake from the older make.
>    I've CCed interested parties for the empty command enhancement in
>bmake as bmake has upstream sources and as such we shouldn't be
>changing things arbitrarily without talking with Simon first.

Yes, thanks.

Patch below should be sufficient.
Oddly, I've done a number of recent buildworlds with bmake and WITH_CTF
and the only issue I saw was:

make: "/b/sjg/work/fbsd-head/src/share/mk/bsd.own.mk" line 490: WITH_CTF
and WITHOUT_CTF can't both be set.


Index: share/mk/bsd.own.mk
===================================================================
--- share/mk/bsd.own.mk	(revision 241871)
+++ share/mk/bsd.own.mk	(working copy)
@@ -671,7 +665,8 @@ MK_${var}:=	no
 
 .if ${MK_CTF} != "no"
 CTFCONVERT_CMD=	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
-.elif defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300
+.elif !defined(.PARSEDIR) && \
+	defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300
 CTFCONVERT_CMD=
 .else
 CTFCONVERT_CMD=	@: