d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow-up r325329: Store all WORLDTMP objects back in the same directory.

Browse Source 
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
This commit is contained in:
Bryan Drewery 2017-11-03 00:29:42 +00:00
parent 7d41856e52
commit 2c36cefeaf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.inc1
View File

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

2
targets/pseudo/bootstrap-tools/Makefile
View File

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