Some components of the crunched binaries may use build-tools
that are to be run on the building host. (Currently, bin/sh and usr.sbin/sysinstall use them.) Make sure we build them in the correct environment, like we do it in the buildworld.
This commit is contained in:
parent
d672a60908
commit
58888af364
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=95731
@ -247,6 +247,7 @@ MAKEREADMES= make readmes PORTSDIR=${CHROOTDIR}/usr/ports
|
||||
MAKEREADMES= true
|
||||
.endif
|
||||
|
||||
TMAKE!= cd ${.CURDIR}/..; ${MAKE} -f Makefile.inc1 -V TMAKE
|
||||
WMAKEENV!= cd ${.CURDIR}/..; ${MAKE} -f Makefile.inc1 -V WMAKEENV
|
||||
WMAKE= ${WMAKEENV} ${MAKE}
|
||||
|
||||
@ -484,17 +485,19 @@ release.3:
|
||||
release.4:
|
||||
rm -rf ${RD}/crunch
|
||||
mkdir -p ${RD}/crunch
|
||||
for j in ${CRUNCH_TARGETS} ; do \
|
||||
rm -rf $${j}_crunch && \
|
||||
mkdir $${j}_crunch && \
|
||||
( cd $${j}_crunch && \
|
||||
( ( [ -f ${.CURDIR}/${MACHINE}/$${j}_crunch.conf ] && \
|
||||
crunchgen ${.CURDIR}/${MACHINE}/$${j}_crunch.conf ) || \
|
||||
( crunchgen ${.CURDIR}/$${j}_crunch.conf ) ) && \
|
||||
${WMAKE} -f $${j}_crunch.mk subclean all ) && \
|
||||
mv $${j}_crunch/$${j}_crunch ${RD}/crunch/$${j} && \
|
||||
true || { rm -rf $${j}_crunch ; false ; } ; \
|
||||
done
|
||||
.for j in ${CRUNCH_TARGETS}
|
||||
rm -rf ${j}_crunch
|
||||
mkdir ${j}_crunch
|
||||
.if exists(${.CURDIR}/${MACHINE}/${j}_crunch.conf)
|
||||
cd ${j}_crunch; crunchgen ${.CURDIR}/${MACHINE}/${j}_crunch.conf
|
||||
.else
|
||||
cd ${j}_crunch; crunchgen ${.CURDIR}/${j}_crunch.conf
|
||||
.endif
|
||||
cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk subclean
|
||||
cd ${.CURDIR}/..; ${TMAKE} build-tools
|
||||
cd ${j}_crunch; ${WMAKE} -f ${j}_crunch.mk all
|
||||
mv ${j}_crunch/${j}_crunch ${RD}/crunch/${j}
|
||||
.endfor
|
||||
touch release.4
|
||||
|
||||
#
|
||||
|
Loading…
Reference in New Issue
Block a user