From owner-svn-src-head@freebsd.org  Sat Nov 18 21:27:35 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 0842CDDCC7E;
 Sat, 18 Nov 2017 21:27:35 +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 C39A57E367;
 Sat, 18 Nov 2017 21:27:34 +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 vAILRXqc039705;
 Sat, 18 Nov 2017 21:27:33 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vAILRXRg039704;
 Sat, 18 Nov 2017 21:27:33 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201711182127.vAILRXRg039704@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, 18 Nov 2017 21:27:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r325986 - head/share/mk
X-SVN-Group: head
X-SVN-Commit-Author: bdrewery
X-SVN-Commit-Paths: head/share/mk
X-SVN-Commit-Revision: 325986
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.25
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, 18 Nov 2017 21:27:35 -0000

Author: bdrewery
Date: Sat Nov 18 21:27:33 2017
New Revision: 325986
URL: https://svnweb.freebsd.org/changeset/base/325986

Log:
  Remove unneeded special case for .OBJDIR=.CURDIR.
  
  The else statement is already handling this by ensuring a safe .OBJDIR is used.
  
  Sponsored by:	Dell

Modified:
  head/share/mk/src.sys.obj.mk

Modified: head/share/mk/src.sys.obj.mk
==============================================================================
--- head/share/mk/src.sys.obj.mk	Sat Nov 18 21:12:06 2017	(r325985)
+++ head/share/mk/src.sys.obj.mk	Sat Nov 18 21:27:33 2017	(r325986)
@@ -192,13 +192,6 @@ MK_AUTO_OBJ:=	${__objdir_writable}
 # The expected OBJDIR already exists, set it as .OBJDIR.
 .if !empty(__objdir) && exists(${__objdir})
 .OBJDIR: ${__objdir}
-# Special case to work around bmake bug.  If the top-level .OBJDIR does not yet
-# exist and MAKEOBJDIR is passed into environment and yield a blank value,
-# bmake will incorrectly set .OBJDIR=${SRCTOP}/ rather than the expected
-# ${SRCTOP} to match ${.CURDIR}.
-.elif ${MAKE_VERSION} <= 20170720 && \
-    ${.CURDIR} == ${SRCTOP} && ${.OBJDIR} == ${SRCTOP}/
-.OBJDIR: ${.CURDIR}
 .else
 # The OBJDIR we wanted does not yet exist, ensure we default to safe .CURDIR
 # in case make started with a bogus MAKEOBJDIR, that expanded before OBJTOP