diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2002-05-14 13:45:50 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2002-05-14 13:45:50 +0000 |
| commit | 61c2d47ae51e053a2d711aa7906ecc68dbbaa79f (patch) | |
| tree | b4be5437037423bdbb6e12c9a88828dc82065d7c /release | |
| parent | 7758617eb4b6bceb91d28ce157b13de96f313142 (diff) | |
| download | src-61c2d47ae51e053a2d711aa7906ecc68dbbaa79f.tar.gz src-61c2d47ae51e053a2d711aa7906ecc68dbbaa79f.zip | |
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.)
Notes
Notes:
svn path=/head/; revision=96586
Diffstat (limited to 'release')
| -rw-r--r-- | release/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/release/Makefile b/release/Makefile index 2b54e46a381d..24e13b151c49 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 |