From debac084e67641338146b8a2247f6b2c1df292b9 Mon Sep 17 00:00:00 2001
From: Glen Barber <gjb@FreeBSD.org>
Date: Wed, 24 Feb 2016 02:59:14 +0000
Subject: [PATCH] Further subdir-ize WSTAGEDIR and KSTAGEDIR base on the
 TARGET/TARGET_ARCH value, since there are valid use cases for having multiple
 on any given system.

Sponsored by:	The FreeBSD Foundation
---
 Makefile.inc1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index 77f3ca01237d..19d2bb1ac35b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1364,8 +1364,8 @@ packagekernel:
 stagekernel:
 	${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} distributekernel
 
-WSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/worldstage
-KSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/kernelstage
+WSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/worldstage
+KSTAGEDIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/${TARGET}.${TARGET_ARCH}/kernelstage
 REPODIR=	${MAKEOBJDIRPREFIX}${.CURDIR}/repo
 PKGSIGNKEY?=	# empty