Fix "make world DESTDIR=/mnt" to work again. A recent change
to make(1) that causes command-line variables to be passed as command-line variables to sub-processes that make(1) executes broke it. By changing the type of all DESTDIR variables used internally in Makefile.inc1, from environment to command-line variables of the highest priority, I was able to "make world" with success, with the command-line variable DESTDIR set.
This commit is contained in:
parent
161a0c7cff
commit
e5d264a34b
@ -177,13 +177,13 @@ CROSSENV= MAKEOBJDIRPREFIX=${OBJTREE} \
|
||||
GROFF_TMAC_PATH=${WORLDTMP}/legacy/usr/share/tmac
|
||||
|
||||
# bootstrap-tools stage
|
||||
BMAKEENV= DESTDIR= \
|
||||
INSTALL="sh ${.CURDIR}/tools/install.sh" \
|
||||
BMAKEENV= INSTALL="sh ${.CURDIR}/tools/install.sh" \
|
||||
PATH=${BPATH}:${PATH} \
|
||||
WORLDTMP=${WORLDTMP} \
|
||||
MAKEFLAGS="-m ${.CURDIR}/tools/build/mk ${.MAKEFLAGS}"
|
||||
BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
|
||||
${BMAKEENV} ${MAKE} -f Makefile.inc1 \
|
||||
DESTDIR= \
|
||||
BOOTSTRAPPING=${OSRELDATE} \
|
||||
-DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPIC -DNOPROFILE \
|
||||
-DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS
|
||||
@ -191,6 +191,7 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \
|
||||
# build-tools stage
|
||||
TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \
|
||||
${BMAKEENV} ${MAKE} -f Makefile.inc1 \
|
||||
DESTDIR= \
|
||||
BOOTSTRAPPING=${OSRELDATE} -DNOLINT -DNO_CPU_CFLAGS -DNO_WARNS
|
||||
|
||||
# cross-tools stage
|
||||
@ -198,11 +199,10 @@ XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB
|
||||
|
||||
# world stage
|
||||
WMAKEENV= ${CROSSENV} \
|
||||
DESTDIR=${WORLDTMP} \
|
||||
_SHLIBDIRPREFIX=${WORLDTMP} \
|
||||
INSTALL="sh ${.CURDIR}/tools/install.sh" \
|
||||
PATH=${TMPPATH}
|
||||
WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1
|
||||
WMAKE= ${WMAKEENV} ${MAKE} -f Makefile.inc1 DESTDIR=${WORLDTMP}
|
||||
|
||||
# install stage
|
||||
.if empty(.MAKEFLAGS:M-n)
|
||||
|
Loading…
Reference in New Issue
Block a user