===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.74
retrieving revision 1.79
diff -u -r1.74 -r1.79
--- src/Makefile.cross	2014/10/09 03:40:12	1.74
+++ src/Makefile.cross	2015/11/10 03:10:53	1.79
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.74 2014/10/09 03:40:12 lteo Exp $
+# $OpenBSD: Makefile.cross,v 1.79 2015/11/10 03:10:53 uebayasi 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
@@ -86,12 +86,6 @@
 COMPILER_VERSION=gcc4
 .endif
 
-.if !empty(BINUTILS217_ARCH:M${_arch})
-BINUTILS_VERSION=binutils-2.17
-.else
-BINUTILS_VERSION=binutils
-.endif
-
 .if !empty(PIE_ARCH:M${_arch})
 NOPIE_FLAGS=-fno-pie
 NOPIE_LDFLAGS=-nopie
@@ -103,7 +97,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
@@ -114,6 +108,8 @@
 NO_CROSS+=groff binutils binutils-2.17 perl texinfo gcc cvs
 NO_CROSS+=nsd
 NO_CROSS+=sqlite3
+NO_CROSS+=bind
+NO_CROSS+=unbound
 
 cross-dirs:	${CROSSDIRS}
 cross-obj:	${CROSSOBJ}
@@ -293,8 +289,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; \
@@ -346,6 +343,7 @@
 	    (cd ${.CURDIR}/$$i; \
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		SKIPDIR=\"${NO_CROSS}\" \
+		DESTDIR=${CROSSDIR} \
 		${MAKE} depend all install); \
 	done
 
@@ -357,6 +355,7 @@
 	    (cd ${.CURDIR}/$$i; \
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 		SKIPDIR=\"${NO_CROSS}\" \
+		DESTDIR=${CROSSDIR} \
 		${MAKE} depend all install); \
 	done