From owner-svn-src-projects@FreeBSD.ORG  Thu Jun 11 13:51:53 2015
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9B977D10;
 Thu, 11 Jun 2015 13:51:53 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8A4151271;
 Thu, 11 Jun 2015 13:51:53 +0000 (UTC) (envelope-from sjg@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5BDprT0078678;
 Thu, 11 Jun 2015 13:51:53 GMT (envelope-from sjg@FreeBSD.org)
Received: (from sjg@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5BDpri0078677;
 Thu, 11 Jun 2015 13:51:53 GMT (envelope-from sjg@FreeBSD.org)
Message-Id: <201506111351.t5BDpri0078677@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: sjg set sender to sjg@FreeBSD.org
 using -f
From: "Simon J. Gerraty" <sjg@FreeBSD.org>
Date: Thu, 11 Jun 2015 13:51:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r284262 - projects/bmake/share/mk
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2015 13:51:53 -0000

Author: sjg
Date: Thu Jun 11 13:51:52 2015
New Revision: 284262
URL: https://svnweb.freebsd.org/changeset/base/284262

Log:
  For debugging we sometimes run makefiles forcing level > 0
  
  Ensure setup that should have happened at level 0 is done.

Modified:
  projects/bmake/share/mk/local.meta.sys.mk

Modified: projects/bmake/share/mk/local.meta.sys.mk
==============================================================================
--- projects/bmake/share/mk/local.meta.sys.mk	Thu Jun 11 13:44:06 2015	(r284261)
+++ projects/bmake/share/mk/local.meta.sys.mk	Thu Jun 11 13:51:52 2015	(r284262)
@@ -4,7 +4,7 @@
 # XXX some of this should be in meta.sys.mk
 # we assume that MK_META_MODE=yes
 
-.if ${.MAKE.LEVEL} == 0
+.if empty(OBJROOT) || ${.MAKE.LEVEL} == 0
 .if !empty(SB)
 SB_OBJROOT ?= ${SB}/obj/
 # this is what we use below