aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2017-11-05 00:11:55 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2017-11-05 00:11:55 +0000
commit2f4c7d14c8f3caf90dee81f7641176eecc52d2ff (patch)
treecf2c7f44ab38f31d4992387c397e29cd1a343e77
parent996e4759621dd7150cec5ad240e252b35a4d9db4 (diff)
downloadsrc-2f4c7d14c8f3caf90dee81f7641176eecc52d2ff.tar.gz
src-2f4c7d14c8f3caf90dee81f7641176eecc52d2ff.zip
Simplify location of bootstrap make.
Sponsored by: Dell EMC Isilon
Notes
Notes: svn path=/head/; revision=325413
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 305e1b948bb5..ae36f9ea1e09 100644
--- a/Makefile
+++ b/Makefile
@@ -209,7 +209,7 @@ WANT_MAKE_VERSION= 20160604
# 20160220 - support .dinclude for FAST_DEPEND.
WANT_MAKE_VERSION= 20160220
.endif
-MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE}
+MYMAKE= ${OBJROOT}make.${MACHINE}/${WANT_MAKE}
.if defined(.PARSEDIR)
HAVE_MAKE= bmake
.else
@@ -407,10 +407,13 @@ upgrade_checks: .PHONY
# headers, libraries and tools. Also, allow the location of
# the system bsdmake-like utility to be overridden.
#
-MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \
+MMAKEENV= \
DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh"
MMAKE= ${MMAKEENV} ${MAKE} \
+ OBJTOP=${MYMAKE:H}/obj \
+ OBJROOT='$${OBJTOP}/' \
+ MAKEOBJDIRPREFIX= \
MAN= -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR \
-DNO_SUBDIR \