=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v retrieving revision 1.73 retrieving revision 1.76 diff -u -r1.73 -r1.76 --- src/Makefile.cross 2014/08/24 20:04:10 1.73 +++ src/Makefile.cross 2015/05/28 18:23:11 1.76 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.cross,v 1.73 2014/08/24 20:04:10 deraadt Exp $ +# $OpenBSD: Makefile.cross,v 1.76 2015/05/28 18:23:11 miod 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,10 +86,10 @@ COMPILER_VERSION=gcc4 .endif -.if !empty(BINUTILS217_ARCH:M${_arch}) -BINUTILS_VERSION=binutils-2.17 -.else +.if !empty(BINUTILS215_ARCH:M${_arch}) BINUTILS_VERSION=binutils +.else +BINUTILS_VERSION=binutils-2.17 .endif .if !empty(PIE_ARCH:M${_arch}) @@ -107,13 +107,15 @@ .endfor # no libcrypto.... these won't build -#NO_CROSS+= dc passwd ppp tcpdump telnet ftp gzsig sasyncd vnconfig +#NO_CROSS+= dc passwd ppp tcpdump telnet ftp sasyncd vnconfig # explicit cross-compile 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 cross-dirs: ${CROSSDIRS} cross-obj: ${CROSSOBJ}