svn commit: r310430 - head/sys/conf

[Ian Lepore]

Author: ian
Date: Thu Dec 22 21:11:42 2016
New Revision: 310430
URL: https://svnweb.freebsd.org/changeset/base/310430

Log:
  Use ${.OBJDIR} to refer to the kernel build object dir, instead of trying
  to recreate it from ${MAKEOBJDIRPREFIX} and ${SRC_BASE} and ${KERNCONF},
  the latter being especially problematic when KERNCONF is set to the names
  of multiple kernel configs.

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

Modified: head/sys/conf/kern.post.mk
==============================================================================
--- head/sys/conf/kern.post.mk	Thu Dec 22 21:01:56 2016	(r310429)
+++ head/sys/conf/kern.post.mk	Thu Dec 22 21:11:42 2016	(r310430)
@@ -63,7 +63,7 @@ OSRELDATE!=	awk '/^\#define[[:space:]]*_
 		    ${MAKEOBJDIRPREFIX}${SRC_BASE}/include/osreldate.h
 .endif
 # Keep the related ports builds in the obj directory so that they are only rebuilt once per kernel build
-WRKDIRPREFIX?=	${MAKEOBJDIRPREFIX}${SRC_BASE}/sys/${KERNCONF}
+WRKDIRPREFIX?=	${.OBJDIR}
 PORTSMODULESENV=\
 	env \
 	-u CC \