Follow-up r325329: Store all WORLDTMP objects back in the same direct…

…ory.

This still keeps the reduced MAKEOBJDIRPREFIX (SRCTOP) redundancy
removed in the OBJDIR, but now keeps all early phase objects
in the same directory rather than split per phase.

The problem of splitting per phase is that later phases want to link in
libraries from earlier phases and base their location on ${OBJTOP}.

Pointyhat to:	bdrewery
Reported by:	mjoras, Mark Millard
Sponsored by:	Dell EMC Isilon

Makefile.inc1

@@ -521,7 +521,7 @@ BMAKEENV=	INSTALL="sh ${.CURDIR}/tools/install.sh" \
 		MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
 # need to keep this in sync with targets/pseudo/bootstrap-tools/Makefile
 BSARGS= 	DESTDIR= \
-		OBJTOP='${WORLDTMP}/obj-$${BWPHASE}' \
+		OBJTOP='${WORLDTMP}/obj-tools' \
 		OBJROOT='$${OBJTOP}/' \
 		BOOTSTRAPPING=${OSRELDATE} \
 		BWPHASE=${.TARGET:C,^_,,} \

targets/pseudo/bootstrap-tools/Makefile

@@ -34,7 +34,7 @@ OSRELDATE?= 0
 
 # need to keep this in sync with src/Makefile.inc1 
 BSARGS= 	DESTDIR= \
-		OBJTOP='${WORLDTMP}/obj-$${BWPHASE}' \
+		OBJTOP='${WORLDTMP}/obj-tools' \
 		OBJROOT='$${OBJTOP}/' \
 		BOOTSTRAPPING=${OSRELDATE} \
 		BWPHASE=${.TARGET} \