From 2c36cefeaf061dd4aeb549469a2d19202d7d9d99 Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Fri, 3 Nov 2017 00:29:42 +0000 Subject: [PATCH] Follow-up r325329: Store all WORLDTMP objects back in the same directory. 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 | 2 +- targets/pseudo/bootstrap-tools/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 0f6fbfbcb18..64bf191d0d4 100644 --- a/Makefile.inc1 +++ b/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,^_,,} \ diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile index 6d5b18d9924..49b168e3721 100644 --- a/targets/pseudo/bootstrap-tools/Makefile +++ b/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} \