From owner-freebsd-bugs@FreeBSD.ORG Sun Oct 7 18:39:18 2012 Return-Path: Delivered-To: freebsd-bugs@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D8F3A106567A; Sun, 7 Oct 2012 18:39:18 +0000 (UTC) (envelope-from sjg@juniper.net) Received: from exprod7og104.obsmtp.com (exprod7og104.obsmtp.com [64.18.2.161]) by mx1.freebsd.org (Postfix) with ESMTP id 178768FC12; Sun, 7 Oct 2012 18:39:16 +0000 (UTC) Received: from P-EMHUB03-HQ.jnpr.net ([66.129.224.36]) (using TLSv1) by exprod7ob104.postini.com ([64.18.6.12]) with SMTP ID DSNKUHHMVFVfGMa6IbLxSnA1xTBsWlRHMsLK@postini.com; Sun, 07 Oct 2012 11:39:18 PDT Received: from magenta.juniper.net (172.17.27.123) by P-EMHUB03-HQ.jnpr.net (172.24.192.33) with Microsoft SMTP Server (TLS) id 8.3.213.0; Sun, 7 Oct 2012 11:38:11 -0700 Received: from chaos.jnpr.net (chaos.jnpr.net [172.24.29.229]) by magenta.juniper.net (8.11.3/8.11.3) with ESMTP id q97IcAh49224; Sun, 7 Oct 2012 11:38:10 -0700 (PDT) (envelope-from sjg@juniper.net) Received: from chaos.jnpr.net (localhost [127.0.0.1]) by chaos.jnpr.net (Postfix) with ESMTP id 9ABF858094; Sun, 7 Oct 2012 11:38:10 -0700 (PDT) To: Garrett Cooper In-Reply-To: References: <201210070701.q977170a033550@red.freebsd.org> <201210070710.q977A9p8087371@freefall.freebsd.org> Comments: In-reply-to: Garrett Cooper message dated "Sun, 07 Oct 2012 01:48:35 -0700." From: "Simon J. Gerraty" X-Mailer: MH-E 7.82+cvs; nmh 1.3; GNU Emacs 22.3.1 Date: Sun, 7 Oct 2012 11:38:10 -0700 Message-ID: <20121007183810.9ABF858094@chaos.jnpr.net> MIME-Version: 1.0 Content-Type: text/plain Cc: Max Khon , freebsd-bugs@freebsd.org, Marcel Moolenaar , sjg@juniper.net Subject: Re: misc/172440: [patch] [build] fix broken CTFCONVERT_CMD call X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 07 Oct 2012 18:39:19 -0000 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= @: