From 61c2d47ae51e053a2d711aa7906ecc68dbbaa79f Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Tue, 14 May 2002 13:45:50 +0000 Subject: [PATCH] Make sure the first ${CHROOTDIR} installworld is done for the correct arch. This makes "make release TARGET_ARCH=foo" really work. (I only tested with "make rerelease" before to save some time and did not notice the problem.) --- release/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/release/Makefile b/release/Makefile index 2b54e46a381..24e13b151c4 100644 --- a/release/Makefile +++ b/release/Makefile @@ -61,6 +61,7 @@ TARGET?= ${MACHINE} TARGET?= ${TARGET_ARCH} .endif CROSSMAKE= ${MAKE} TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET} +NATIVEMAKE= ${MAKE} TARGET_ARCH=${MACHINE_ARCH} TARGET=${MACHINE} # If you are using a local CVS repository with components stored in # non-standard modules, override these on the make commandline or @@ -264,9 +265,9 @@ rerelease release: .endif mkdir -p ${CHROOTDIR} @echo ">>> make release started on `LC_ALL=C TZ=GMT date`" - cd ${.CURDIR}/.. && ${MAKE} -DNOGAMES -DNOHTML -DNOINFO -DNOMAN \ + cd ${.CURDIR}/.. && ${NATIVEMAKE} -DNOGAMES -DNOHTML -DNOINFO -DNOMAN \ -DNOPROFILE installworld DESTDIR=${CHROOTDIR} - cd ${.CURDIR}/../etc && ${MAKE} distribution DESTDIR=${CHROOTDIR} + cd ${.CURDIR}/../etc && ${NATIVEMAKE} distribution DESTDIR=${CHROOTDIR} if [ -f /etc/resolv.conf ]; then \ cp -p /etc/resolv.conf ${CHROOTDIR}/etc; \ fi