diff options
| author | ru <ru@FreeBSD.org> | 2002-05-14 13:45:50 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2002-05-14 13:45:50 +0000 |
| commit | 7d4d97cfb9f1f4afed64f210398472804b4732d8 (patch) | |
| tree | b4be5437037423bdbb6e12c9a88828dc82065d7c /release | |
| parent | 64f3b6c534fab647da74347c9e25a5397e350709 (diff) | |
| download | FreeBSD-src-7d4d97cfb9f1f4afed64f210398472804b4732d8.zip FreeBSD-src-7d4d97cfb9f1f4afed64f210398472804b4732d8.tar.gz | |
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.)
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 2b54e46..24e13b1 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 |
