aboutsummaryrefslogtreecommitdiff
path: root/targets
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2017-11-02 18:08:36 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2017-11-02 18:08:36 +0000
commit4dc89c4d51cc6e82623e6bfb48718d9f7752312a (patch)
tree04c37c0b29b728530df625483174651c208d7c00 /targets
parent47902a71f34d554fd82251d01e50d76a18f550e4 (diff)
downloadsrc-4dc89c4d51cc6e82623e6bfb48718d9f7752312a.tar.gz
src-4dc89c4d51cc6e82623e6bfb48718d9f7752312a.zip
Reduce MAKEOBJDIRPREFIX path spam by specifying a direct objdir to use.
Sponsored by: Dell EMC Isilon
Notes
Notes: svn path=/head/; revision=325329
Diffstat (limited to 'targets')
-rw-r--r--targets/pseudo/bootstrap-tools/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile
index 95f16f0530a8..6d5b18d99247 100644
--- a/targets/pseudo/bootstrap-tools/Makefile
+++ b/targets/pseudo/bootstrap-tools/Makefile
@@ -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