=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v retrieving revision 1.76 retrieving revision 1.77 diff -c -r1.76 -r1.77 *** src/Makefile.cross 2015/05/28 18:23:11 1.76 --- src/Makefile.cross 2015/06/01 17:36:17 1.77 *************** *** 1,4 **** ! # $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 --- 1,4 ---- ! # $OpenBSD: Makefile.cross,v 1.77 2015/06/01 17:36:17 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,97 **** 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 --- 86,91 ---- *************** *** 103,109 **** BINUTILS= ar as gasp ld nm objcopy objdump ranlib readelf size \ strings strip ! BINUTILS_DIR=gnu/usr.bin/${BINUTILS_VERSION} .endfor # no libcrypto.... these won't build --- 97,103 ---- BINUTILS= ar as gasp ld nm objcopy objdump ranlib readelf size \ strings strip ! BINUTILS_DIR=gnu/usr.bin/binutils-2.17 .endfor # no libcrypto.... these won't build