From owner-svn-src-all@freebsd.org  Wed Sep 16 18:02:30 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 209F89CD5D6;
 Wed, 16 Sep 2015 18:02:30 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 by mx1.freebsd.org (Postfix) with ESMTP id 0D9BD1287;
 Wed, 16 Sep 2015 18:02:30 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [IPv6:::1])
 by freefall.freebsd.org (Postfix) with ESMTP id 0604D1863;
 Wed, 16 Sep 2015 18:02:30 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from mail.xzibition.com (localhost [172.31.3.2])
 by mail.xzibition.com (Postfix) with ESMTP id B8F7211EF0;
 Wed, 16 Sep 2015 18:02:29 +0000 (UTC)
X-Virus-Scanned: amavisd-new at mail.xzibition.com
Received: from mail.xzibition.com ([172.31.3.2])
 by mail.xzibition.com (mail.xzibition.com [172.31.3.2]) (amavisd-new,
 port 10026)
 with LMTP id sBUOrYTMGDXR; Wed, 16 Sep 2015 18:02:27 +0000 (UTC)
Subject: Re: svn commit: r287636 - head/share/mk
DKIM-Filter: OpenDKIM Filter v2.9.2 mail.xzibition.com 20A8511EEA
To: "Simon J. Gerraty" <sjg@juniper.net>, Julian Elischer <julian@freebsd.org>
References: <201509110019.t8B0JocS082576@repo.freebsd.org>
 <55F2529E.5080105@freebsd.org> <13099.1441985049@chaos>
Cc: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
From: Bryan Drewery <bdrewery@FreeBSD.org>
Organization: FreeBSD
Message-ID: <55F9AEB1.4040009@FreeBSD.org>
Date: Wed, 16 Sep 2015 11:02:25 -0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:38.0)
 Gecko/20100101 Thunderbird/38.2.0
MIME-Version: 1.0
In-Reply-To: <13099.1441985049@chaos>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 16 Sep 2015 18:02:30 -0000

On 9/11/15 8:24 AM, Simon J. Gerraty wrote:
> Julian Elischer <julian@freebsd.org> wrote:
>>>    If MAKEOBJDIR is empty or not a suitable value (no '/')
>>>    set a default that works.
>>
>> if not suitable..  it should error (with a really explicit error
>> message), not do something else..
> 
> How about:
> 
> $ MAKEOBJDIR='obj.${MACHINE}' make -C bin/cat -DWITH_META_MODE -V .OBJDIR
> make: "/b/sjg/work/FreeBSD/current/src/share/mk/local.meta.sys.mk" line
> 29: Cannot use MAKEOBJDIR=obj.amd64
> Unset MAKEOBJDIR to get default:  MAKEOBJDIR='${.CURDIR:S,${SRCTOP},${OBJTOP},}'
> $
> 
> Index: share/mk/local.meta.sys.mk
> ===================================================================
> --- share/mk/local.meta.sys.mk	(revision 287636)
> +++ share/mk/local.meta.sys.mk	(working copy)
> @@ -16,15 +16,19 @@
>  MAKEOBJDIRPREFIX=
>  .export MAKEOBJDIRPREFIX
>  .endif
> -.if empty(MAKEOBJDIR) || ${MAKEOBJDIR:M*/*} == ""
> +_default_makeobjdir=$${.CURDIR:S,$${SRCTOP},$${OBJTOP},}
> +.if empty(MAKEOBJDIR)
>  # OBJTOP set below
> -MAKEOBJDIR=$${.CURDIR:S,$${SRCTOP},$${OBJTOP},}
> +MAKEOBJDIR=${_default_makeobjdir}
>  # export but do not track
>  .export-env MAKEOBJDIR
>  # now for our own use
>  MAKEOBJDIR= ${.CURDIR:S,${SRCTOP},${OBJTOP},}
>  .endif
> +.if ${MAKEOBJDIR:M*/*} == ""
> +.error Cannot use MAKEOBJDIR=${MAKEOBJDIR}${.newline}Unset MAKEOBJDIR to get default:  MAKEOBJDIR='${_default_makeobjdir}'
>  .endif
> +.endif
>  .if !empty(SB)
>  SB_OBJROOT ?= ${SB}/obj/
>  # this is what we use below
> 

I have committed this as it seems fine and I need to make changes around
the code.

-- 
Regards,
Bryan Drewery