diff options
author | 1998-05-17 07:37:08 +0000 | |
---|---|---|
committer | 1998-05-17 07:37:08 +0000 | |
commit | f4a9ae370073fa4bf45742c3183ba4240796ae64 (patch) | |
tree | c74cdb5f73b2676179e9b6c42ded06161afb940b | |
parent | Fix strncat() usage; Some from cstone@pobox.com (diff) | |
download | wireguard-openbsd-f4a9ae370073fa4bf45742c3183ba4240796ae64.tar.xz wireguard-openbsd-f4a9ae370073fa4bf45742c3183ba4240796ae64.zip |
Revert to 1.32, in the future CROSSENV will be used with different
MAKEOBJDIR values
-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 \ |