summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorian <ian@FreeBSD.org>2017-03-01 18:03:34 +0000
committerian <ian@FreeBSD.org>2017-03-01 18:03:34 +0000
commit39acd2cb7464087a8d0710726c28b56c92c607b8 (patch)
tree317843fa97bad6acdf7b5ed1c5319a7d65d86586
parentaebbeb8df32658dd39719bb222b180f2af1dcb1d (diff)
downloadFreeBSD-src-39acd2cb7464087a8d0710726c28b56c92c607b8.zip
FreeBSD-src-39acd2cb7464087a8d0710726c28b56c92c607b8.tar.gz
MFC r310430:
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.
-rw-r--r--sys/conf/kern.post.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index a16cb03..095b275 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -63,7 +63,7 @@ OSRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
${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 \
OpenPOWER on IntegriCloud