svn commit: r325570 - head/sys/conf

[Bryan Drewery]

Author: bdrewery
Date: Thu Nov  9 02:37:49 2017
New Revision: 325570
URL: https://svnweb.freebsd.org/changeset/base/325570

Log:
  AUTO_OBJ: Fix 'old style' kernel builds using wrong .OBJDIR.
  
  There's no way currently to automatically prevent the bad .OBJDIR from being
  created but it can at least be prevented from being used.  Passing
  WITHOUT_AUTO_OBJ=yes or MK_AUTO_OBJ=no or -DNO_OBJ in will prevent it.
  
  Reported by:	jeffr
  Sponsored by:	Dell EMC Isilon
  Differential Revision:	https://reviews.freebsd.org/D12989

Modified:
  head/sys/conf/kern.pre.mk

Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk	Thu Nov  9 01:41:00 2017	(r325569)
+++ head/sys/conf/kern.pre.mk	Thu Nov  9 02:37:49 2017	(r325570)
@@ -24,6 +24,9 @@ _srcconf_included_:
 .MAKE.MODE+=	curdirOk=yes
 .endif
 
+# The kernel build always expects .OBJDIR=.CURDIR.
+.OBJDIR: ${.CURDIR}
+
 .if defined(NO_OBJWALK) || ${MK_AUTO_OBJ} == "yes"
 NO_OBJWALK=		t
 NO_MODULES_OBJ=	t