=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v retrieving revision 1.102 retrieving revision 1.105 diff -u -r1.102 -r1.105 --- src/Makefile 2004/04/21 15:58:21 1.102 +++ src/Makefile 2004/10/16 15:28:14 1.105 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.102 2004/04/21 15:58:21 miod Exp $ +# $OpenBSD: Makefile,v 1.105 2004/10/16 15:28:14 grange Exp $ # # For more information on building in tricky environments, please see @@ -134,10 +134,10 @@ echo m68k ;;\ luna88k|mvme88k) \ echo m88k ;;\ - macppc|mvmeppc|pegasos) \ + macppc|mvmeppc) \ echo powerpc ;;\ sgi) \ - echo mips ;;\ + echo mips64 ;;\ *) \ (echo Unknown arch ${TARGET} >&2) ; exit 1;; \ esac > ${CROSSDIR}/TARGET_ARCH @@ -176,8 +176,7 @@ .if ${TARGET} == "alpha" || ${TARGET} == "amd64" || ${TARGET} == "hppa" || \ ${TARGET} == "i386" || ${TARGET} == "macppc" || ${TARGET} == "mvmeppc" || \ - ${TARGET} == "pegasos" || ${TARGET} == "sparc" || ${TARGET} == "sparc64" || \ - ${TARGET} == "sgi" + ${TARGET} == "sparc" || ${TARGET} == "sparc64" || ${TARGET} == "sgi" BINUTILS= ar as gasp ld nm objcopy objdump ranlib readelf size \ strings strip NEW_BINUTILS?= Yes @@ -237,8 +236,7 @@ .endif (cd ${.CURDIR}/usr.bin/nm; \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ - ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \ - NOMAN= depend all; \ + ${MAKE} NOMAN= depend all; \ DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} NOMAN= install) ln -sf ${CROSSDIR}/usr/bin/nm \