===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.78
retrieving revision 1.79
diff -c -r1.78 -r1.79
*** src/Makefile	2001/09/14 06:03:11	1.78
--- src/Makefile	2001/09/17 01:18:34	1.79
***************
*** 1,4 ****
! #	$OpenBSD: Makefile,v 1.78 2001/09/14 06:03:11 fgsch Exp $
  
  #
  # For more information on building in tricky environments, please see
--- 1,4 ----
! #	$OpenBSD: Makefile,v 1.79 2001/09/17 01:18:34 art Exp $
  
  #
  # For more information on building in tricky environments, please see
***************
*** 114,134 ****
  		HOSTCC=cc
  CROSSPATH=	${PATH}:${CROSSDIR}/usr/bin
  
- .if (${TARGET} == "sparc64")
- CROSSENV+= CPPFLAGS=-D__arch64__
- CPPFLAGS=-D__arch64__
- .endif
- 
  cross-env:
! 	@echo ${CROSSENV} DESTDIR=${CROSSDIR}
  
  cross-helpers:
  	@-mkdir -p ${CROSSDIR}
! 	echo _MACHINE_ARCH | \
! 	    cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \
! 	    ${CPP} ${CPPFLAGS} -E -I${.CURDIR}/sys/arch | \
! 	    sed -n '$$p' >${CROSSDIR}/TARGET_ARCH
! 	eval `grep '^osr=' sys/conf/newvers.sh`; \
  	   sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
  	   ${CROSSDIR}/TARGET_CANON
  
--- 114,138 ----
  		HOSTCC=cc
  CROSSPATH=	${PATH}:${CROSSDIR}/usr/bin
  
  cross-env:
! 	@echo ${CROSSENV} DESTDIR=${CROSSDIR} MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`
  
  cross-helpers:
  	@-mkdir -p ${CROSSDIR}
! 	@case ${TARGET} in \
! 		sparc|i386|m68k|alpha|hppa|powerpc|sparc64|m88k|vax) \
! 			echo ${TARGET} ;;\
! 		amiga|sun3|mac68k|hp300|mvme68k) \
! 			echo m68k ;;\
! 		mvme88k) \
! 			echo m88k ;;\
! 		mvmeppc|macppc) \
! 			echo powerpc ;;\
! 		*) \
! 			(echo Unknown arch ${TARGET} >&2) ; exit 1;; \
! 	esac > ${CROSSDIR}/TARGET_ARCH
! 	@echo TARGET_ARCH is `cat ${CROSSDIR}/TARGET_ARCH`
! 	@eval `grep '^osr=' sys/conf/newvers.sh`; \
  	   sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \
  	   ${CROSSDIR}/TARGET_CANON
  
***************
*** 161,167 ****
  	    ${MAKE} DESTDIR=${CROSSDIR} includes
  
  .if ${TARGET} == "macppc" || ${TARGET} == "alpha" || ${TARGET} == "hppa" || \
!     ${TARGET} == "sparc64"|| ${TARGET} == "mvmeppc" 
  cross-binutils: cross-binutils-new cross-binutils-links
  .else
  cross-binutils: cross-binutils-old cross-binutils-links
--- 165,171 ----
  	    ${MAKE} DESTDIR=${CROSSDIR} includes
  
  .if ${TARGET} == "macppc" || ${TARGET} == "alpha" || ${TARGET} == "hppa" || \
!     ${TARGET} == "sparc64"|| ${TARGET} == "mvmeppc"
  cross-binutils: cross-binutils-new cross-binutils-links
  .else
  cross-binutils: cross-binutils-old cross-binutils-links
***************
*** 199,207 ****
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
! 	    TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    ${MAKE} depend all; \
! 	    TARGET_MACHINE_ARCH=${TARGET} \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/as \
--- 203,211 ----
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
! 	    TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
! 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} depend all; \
! 	    TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/as \
***************
*** 212,220 ****
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
! 	    TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    ${MAKE} NOMAN= depend all; \
! 	    TARGET_MACHINE_ARCH=${TARGET} \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/ld \
--- 216,224 ----
  	    BSDOBJDIR=${CROSSDIR}/usr/obj \
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
! 	    TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
! 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
! 	    TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/ld \
***************
*** 248,256 ****
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= depend all; \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/strip \
  	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip
  
--- 252,262 ----
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
! 	    NOMAN= depend all; \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
! 	    NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/strip \
  	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip
  
***************
*** 260,266 ****
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= depend all; \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/size \
--- 266,273 ----
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
! 	    NOMAN= depend all; \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/size \
***************
*** 272,278 ****
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= depend all; \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/nm \
--- 279,286 ----
  	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} obj; \
  	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
! 	    ${MAKE} TARGET_MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \
! 	    NOMAN= depend all; \
  	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
  	    ${MAKE} NOMAN= install)
  	ln -sf ${CROSSDIR}/usr/bin/nm \