===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.76
retrieving revision 1.88
diff -u -r1.76 -r1.88
--- src/Makefile.cross	2015/05/28 18:23:11	1.76
+++ src/Makefile.cross	2016/09/23 09:18:05	1.88
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.76 2015/05/28 18:23:11 miod Exp $
+# $OpenBSD: Makefile.cross,v 1.88 2016/09/23 09:18:05 sthen Exp $
 
 cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib:	cross-tools cross-bin cross-share cross-sys cross-etc-root-var
@@ -6,18 +6,15 @@
 
 # Have to compute TARGET_ARCH directly in the Makefile, for .if tests involving
 # this variable to work.
-.if	(${TARGET} == "armish" || ${TARGET} == "armv7" || \
-	 ${TARGET} == "zaurus")
+.if	(${TARGET} == "armv7")
 TARGET_ARCH=	arm
-.elif	(${TARGET} == "aviion" || ${TARGET} == "luna88k")
+.elif	(${TARGET} == "luna88k")
 TARGET_ARCH=	m88k
 .elif	(${TARGET} == "sgi" || ${TARGET} == "octeon")
 TARGET_ARCH=	mips64
 .elif	(${TARGET} == "loongson")
 TARGET_ARCH=	mips64el
 TARGET_CPU=	mips64
-.elif	(${TARGET} == "solbourne")
-TARGET_ARCH=	sparc
 .elif	(${TARGET} == "macppc" || ${TARGET} == "socppc")
 TARGET_ARCH=	powerpc
 .elif	(${TARGET} == "landisk")
@@ -29,7 +26,7 @@
 
 # List of LP64 archs
 # XXX move to bsd.*.mk?
-LP64_ARCH = amd64 alpha hppa64 ia64 mips64 sparc64 vax64
+LP64_ARCH = amd64 alpha mips64 sparc64
 
 TARGET_IS_LP64 =
 MACHINE_IS_LP64 =
@@ -86,12 +83,6 @@
 COMPILER_VERSION=gcc4
 .endif
 
-.if !empty(BINUTILS215_ARCH:M${_arch})
-BINUTILS_VERSION=binutils
-.else
-BINUTILS_VERSION=binutils-2.17
-.endif
-
 .if !empty(PIE_ARCH:M${_arch})
 NOPIE_FLAGS=-fno-pie
 NOPIE_LDFLAGS=-nopie
@@ -103,7 +94,7 @@
 
 BINUTILS=	ar as gasp ld nm objcopy objdump ranlib readelf size \
 		strings strip
-BINUTILS_DIR=gnu/usr.bin/${BINUTILS_VERSION}
+BINUTILS_DIR=gnu/usr.bin/binutils-2.17
 .endfor
 
 # no libcrypto.... these won't build
@@ -113,7 +104,6 @@
 NO_CROSS+=microcode
 NO_CROSS+=groff binutils binutils-2.17 perl texinfo gcc cvs
 NO_CROSS+=nsd
-NO_CROSS+=sqlite3
 NO_CROSS+=bind
 NO_CROSS+=unbound
 
@@ -295,8 +285,9 @@
 # XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later
 cross-lib:	${CROSSGCC}
 	MACHINE=${TARGET} \
-	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU}; \
-	export MACHINE MACHINE_ARCH MACHINE_CPU; \
+	    MACHINE_ARCH=${TARGET_ARCH} MACHINE_CPU=${TARGET_CPU} \
+	    BSDOBJDIR=${CROSSDIR}/usr/obj; \
+	export MACHINE MACHINE_ARCH MACHINE_CPU BSDOBJDIR; \
 	(cd ${.CURDIR}/lib; \
 	    for lib in csu libc; do \
 	    (cd $$lib; \
@@ -306,10 +297,10 @@
 		    ${MAKE} install); \
 	    done; \
 	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	        SKIPDIR=\"${NO_CROSS} libocurses/PSD.doc\" \
+	        SKIPDIR=\"${NO_CROSS}\" \
 	        ${MAKE} depend all ; \
 	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} DESTDIR=${CROSSDIR} \
-	        SKIPDIR=\"${NO_CROSS} libocurses/PSD.doc\" \
+	        SKIPDIR=\"${NO_CROSS}\" \
 	        ${MAKE} install)
 
 cross-bin:	${CROSSOBJ}
@@ -348,6 +339,7 @@
 	    (cd ${.CURDIR}/$$i; \
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		SKIPDIR=\"${NO_CROSS}\" \
+		DESTDIR=${CROSSDIR} \
 		${MAKE} depend all install); \
 	done
 
@@ -359,6 +351,7 @@
 	    (cd ${.CURDIR}/$$i; \
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		SKIPDIR=\"${NO_CROSS}\" \
+		DESTDIR=${CROSSDIR} \
 		${MAKE} depend all install); \
 	done