diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-05-17 07:37:09 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1998-05-17 07:37:09 +0000 |
| commit | 63fcf1e49ccebf5f968c22dca016f31b7fd96369 (patch) | |
| tree | 7116eac65dc02aa494b7150b159b91896fe186f5 /Makefile | |
| parent | 3ce3689d4afb85b26f7bca3f41d7a375e6b9f1e6 (diff) | |
Revert to 1.32, in the future CROSSENV will be used with different
MAKEOBJDIR values
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 1998/05/17 06:32:07 mickey Exp $ +# $OpenBSD: Makefile,v 1.34 1998/05/17 07:37:08 niklas Exp $ # # For more information on building in tricky environments, please see @@ -93,7 +93,7 @@ CROSSENV= AR=${CROSSDIR}/usr/bin/ar AS=${CROSSDIR}/usr/bin/as \ LD=${CROSSDIR}/usr/bin/ld NM=${CROSSDIR}/usr/bin/nm \ RANLIB=${CROSSDIR}/usr/bin/ranlib \ SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \ - HOSTCC=cc MAKEOBJDIR=obj.${MACHINE}.${TARGET} + HOSTCC=cc cross-helpers: -mkdir -p ${CROSSDIR}/usr/include @@ -277,11 +277,12 @@ cross-lib: ${MAKE} obj; \ for lib in csu libc; do \ (cd $$lib; \ - ${CROSSENV} ${MAKE} NOMAN=; \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN=; \ DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} NOMAN= install); \ done; \ - ${CROSSENV} ${MAKE} NOMAN=; \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \ SKIPDIR=libocurses/PSD.doc ${MAKE} NOMAN= install) ln -sf ${CROSSDIR}/usr/lib \ |