From owner-svn-src-head@freebsd.org  Fri Nov  3 01:09:36 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 3E905E66FAA;
 Fri,  3 Nov 2017 01:09:36 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 037077031C;
 Fri,  3 Nov 2017 01:09:35 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vA319ZTp053764;
 Fri, 3 Nov 2017 01:09:35 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA319Zf8053763;
 Fri, 3 Nov 2017 01:09:35 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201711030109.vA319Zf8053763@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Fri, 3 Nov 2017 01:09:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325351 - head/share/mk
X-SVN-Group: head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 325351
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 03 Nov 2017 01:09:36 -0000

Author: bdrewery
Date: Fri Nov  3 01:09:35 2017
New Revision: 325351
URL: https://svnweb.freebsd.org/changeset/base/325351

Log:
  AUTO_OBJ: If the wanted .OBJDIR was not used then disable the feature.
  
  This is to prevent downstream checks from assuming they can trust .OBJDIR when
  MK_AUTO_OBJ is yes, such as the bsd.obj.mk checks.
  
  Pointyhat to:	bdrewery
  Sponsored by:	Dell EMC Isilon

Modified:
  head/share/mk/sys.mk

Modified: head/share/mk/sys.mk
==============================================================================
--- head/share/mk/sys.mk	Fri Nov  3 00:29:42 2017	(r325350)
+++ head/share/mk/sys.mk	Fri Nov  3 01:09:35 2017	(r325351)
@@ -120,8 +120,14 @@ NO_META_IGNORE_HOST_HEADERS=	1
 # is not expected.
 .if !make(showconfig) && !make(print-dir)
 .sinclude <auto.obj.mk>
+# The .OBJDIR was not set, disable MK_AUTO_OBJ so downstream checks won't
+# assume .OBJDIR is proper.
+.if defined(__objdir) && ${.OBJDIR} != ${__objdir}
+.MAKEOVERRIDES+= MK_AUTO_OBJ
+MK_AUTO_OBJ=	no
 .endif
 .endif
+.endif	# ${MK_AUTO_OBJ} == "yes"
 .else # bmake
 .include <bsd.mkopt.mk>
 .endif