Author: bdrewery
Date: Thu Nov 2 18:08:36 2017
New Revision: 325329
URL: https://svnweb.freebsd.org/changeset/base/325329
Log:
Reduce MAKEOBJDIRPREFIX path spam by specifying a direct objdir to use.
Sponsored by: Dell EMC Isilon
Modified:
head/Makefile.inc1
head/Makefile.libcompat
head/targets/pseudo/bootstrap-tools/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Thu Nov 2 18:04:29 2017 (r325328)
+++ head/Makefile.inc1 Thu Nov 2 18:08:36 2017 (r325329)
@@ -521,6 +521,8 @@ 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}' \
+ OBJROOT='$${OBJTOP}/' \
BOOTSTRAPPING=${OSRELDATE} \
BWPHASE=${.TARGET:C,^_,,} \
SSP_CFLAGS= \
@@ -531,7 +533,7 @@ BSARGS= DESTDIR= \
MK_LLDB=no MK_TESTS=no \
MK_INCLUDES=yes
-BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
+BMAKE= \
${BMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
${BSARGS}
@@ -558,9 +560,11 @@ XMAKE= ${BMAKE} \
KTMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${BPATH}:${PATH} \
WORLDTMP=${WORLDTMP}
-KTMAKE= TOOLS_PREFIX=${WORLDTMP} MAKEOBJDIRPREFIX=${WORLDTMP} \
+KTMAKE= TOOLS_PREFIX=${WORLDTMP} \
${KTMAKEENV} ${MAKE} ${WORLD_FLAGS} -f Makefile.inc1 \
DESTDIR= \
+ OBJTOP='${WORLDTMP}/obj-kernel-tools' \
+ OBJROOT='$${OBJTOP}/' \
BOOTSTRAPPING=${OSRELDATE} \
SSP_CFLAGS= \
MK_HTML=no -DNO_LINT MK_MAN=no \
Modified: head/Makefile.libcompat
==============================================================================
--- head/Makefile.libcompat Thu Nov 2 18:04:29 2017 (r325328)
+++ head/Makefile.libcompat Thu Nov 2 18:08:36 2017 (r325329)
@@ -108,7 +108,8 @@ LIBCOMPATCXXFLAGS+= -isystem ${LIBCOMPATTMP}/usr/inclu
# Yes, the flags are redundant.
LIBCOMPATWMAKEENV+= \
- MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTOP} \
+ OBJTOP=${LIBCOMPAT_OBJTOP} \
+ OBJROOT='$${OBJTOP}/' \
INSTALL="sh ${.CURDIR}/tools/install.sh" \
PATH=${TMPPATH} \
SYSROOT=${LIBCOMPATTMP} \
@@ -184,7 +185,8 @@ build${libcompat}: .PHONY
${_+_}cd ${.CURDIR}/${_dir}; \
WORLDTMP=${WORLDTMP} \
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}" \
- MAKEOBJDIRPREFIX=${LIBCOMPAT_OBJTOP} \
+ OBJTOP=${LIBCOMPAT_OBJTOP} \
+ OBJROOT='$${OBJTOP}/' \
${MAKE} SSP_CFLAGS= DESTDIR= \
DIRPRFX=${_dir}/ -DNO_LINT -DNO_CPU_CFLAGS MK_WARNS=no MK_CTF=no \
build-tools
Modified: head/targets/pseudo/bootstrap-tools/Makefile
==============================================================================
--- head/targets/pseudo/bootstrap-tools/Makefile Thu Nov 2 18:04:29
2017 (r325328)
+++ head/targets/pseudo/bootstrap-tools/Makefile Thu Nov 2 18:08:36
2017 (r325329)
@@ -13,10 +13,10 @@ TARGET_MACHINE= host
HOST_MACHINE!= uname -m
HOST_MACHINE_ARCH!= uname -p
BTOOLSDIR?= ${HOST_OBJTOP}/tools
+WORLDTMP= ${BTOOLSDIR}
LEGACY_TOOLS?= ${BTOOLSDIR}/legacy
BSENV= \
- unset MAKEOBJDIR; MAKEOBJDIRPREFIX=${BTOOLSDIR} \
MAKESYSPATH=${SRCTOP}/tools/build/mk:${SRCTOP}/share/mk \
TARGET=${HOST_MACHINE} TARGET_ARCH=${HOST_MACHINE_ARCH} \
WITHOUT_STAGING=1 STAGE_ROOT= BOOTSTRAPPING_TOOLS=1 \
@@ -34,6 +34,8 @@ OSRELDATE?= 0
# need to keep this in sync with src/Makefile.inc1
BSARGS= DESTDIR= \
+ OBJTOP='${WORLDTMP}/obj-$${BWPHASE}' \
+ OBJROOT='$${OBJTOP}/' \
BOOTSTRAPPING=${OSRELDATE} \
BWPHASE=${.TARGET} \
SSP_CFLAGS= \
@@ -44,8 +46,6 @@ BSARGS= DESTDIR= \
MK_LLDB=no MK_TESTS=no \
MK_INCLUDES=yes
-# Need to override these so OBJTOP uses are proper in the non-meta build.
-BSARGS+= OBJTOP=${BTOOLSDIR}${SRCTOP} OBJROOT='$${OBJTOP}/'
# We will handle building the toolchain and cross-compiler.
BSARGS+= MK_CROSS_COMPILER=no MK_CLANG=no MK_GCC=no
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
