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

Simplify location of bootstrap make.

Browse Source 
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-11-05 00:11:55 +00:00
parent 996e475962
commit 2f4c7d14c8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -209,7 +209,7 @@ WANT_MAKE_VERSION= 20160604
# 20160220 - support .dinclude for FAST_DEPEND. # 20160220 - support .dinclude for FAST_DEPEND.
WANT_MAKE_VERSION= 20160220 WANT_MAKE_VERSION= 20160220
.endif .endif
MYMAKE= ${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE} MYMAKE= ${OBJROOT}make.${MACHINE}/${WANT_MAKE}
.if defined(.PARSEDIR) .if defined(.PARSEDIR)
HAVE_MAKE= bmake HAVE_MAKE= bmake
.else .else
@ -407,10 +407,13 @@ upgrade_checks: .PHONY
# headers, libraries and tools. Also, allow the location of # headers, libraries and tools. Also, allow the location of
# the system bsdmake-like utility to be overridden. # the system bsdmake-like utility to be overridden.
# #
MMAKEENV= MAKEOBJDIRPREFIX=${MYMAKE:H} \ MMAKEENV= \
DESTDIR= \ DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh" INSTALL="sh ${.CURDIR}/tools/install.sh"
MMAKE= ${MMAKEENV} ${MAKE} \ MMAKE= ${MMAKEENV} ${MAKE} \
OBJTOP=${MYMAKE:H}/obj \
OBJROOT='$${OBJTOP}/' \
MAKEOBJDIRPREFIX= \
MAN= -DNO_SHARED \ MAN= -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR \ -DNO_CPU_CFLAGS -DNO_WERROR \
-DNO_SUBDIR \ -DNO_SUBDIR \