From owner-svn-src-head@freebsd.org  Sat Nov  4 21:06:40 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 E11E1E55CB3;
 Sat,  4 Nov 2017 21:06:40 +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 AEA16825EF;
 Sat,  4 Nov 2017 21:06:40 +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 vA4L6dVj065295;
 Sat, 4 Nov 2017 21:06:39 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vA4L6dZi065294;
 Sat, 4 Nov 2017 21:06:39 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201711042106.vA4L6dZi065294@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: Sat, 4 Nov 2017 21:06:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325406 - head/share/mk
X-SVN-Group: head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 325406
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: Sat, 04 Nov 2017 21:06:41 -0000

Author: bdrewery
Date: Sat Nov  4 21:06:39 2017
New Revision: 325406
URL: https://svnweb.freebsd.org/changeset/base/325406

Log:
  AUTO_OBJ: Revert r325351 now that the fix is in auto.obj.mk in r325404.
  
  Forcing MK_AUTO_OBJ to no is not really needed since bsd.obj.mk is protected
  against 'rm -rf ${.CURDIR}' already.  It was also flawed as if MK_AUTO_OBJ=yes
  was in the .MAKEOVERRIDES already then it just remained on.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/share/mk/sys.mk

Modified: head/share/mk/sys.mk
==============================================================================
--- head/share/mk/sys.mk	Sat Nov  4 21:05:03 2017	(r325405)
+++ head/share/mk/sys.mk	Sat Nov  4 21:06:39 2017	(r325406)
@@ -120,12 +120,6 @@ 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