Author: bdrewery
Date: Fri Nov 3 00:29:42 2017
New Revision: 325350
URL: https://svnweb.freebsd.org/changeset/base/325350
Log:
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
Modified:
head/Makefile.inc1
head/targets/pseudo/bootstrap-tools/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Fri Nov 3 00:12:32 2017 (r325349)
+++ head/Makefile.inc1 Fri Nov 3 00:29:42 2017 (r325350)
@@ -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,^_,,} \
Modified: head/targets/pseudo/bootstrap-tools/Makefile
==============================================================================
--- head/targets/pseudo/bootstrap-tools/Makefile Fri Nov 3 00:12:32
2017 (r325349)
+++ head/targets/pseudo/bootstrap-tools/Makefile Fri Nov 3 00:29:42
2017 (r325350)
@@ -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} \
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
