=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v retrieving revision 1.69 retrieving revision 1.73 diff -u -r1.69 -r1.73 --- src/Makefile.cross 2014/03/18 22:36:27 1.69 +++ src/Makefile.cross 2014/08/24 20:04:10 1.73 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.cross,v 1.69 2014/03/18 22:36:27 miod Exp $ +# $OpenBSD: Makefile.cross,v 1.73 2014/08/24 20:04:10 deraadt 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 @@ -107,16 +107,12 @@ .endfor # no libcrypto.... these won't build -#NO_CROSS+= dc login_krb5 login_krb5-or-pwd passwd ppp tcpdump telnet \ -# ftp gzsig sasyncd vnconfig +#NO_CROSS+= dc passwd ppp tcpdump telnet ftp gzsig sasyncd vnconfig # explicit cross-compile -NO_CROSS+=bind -NO_CROSS+=httpd NO_CROSS+=microcode -NO_CROSS+=groff lynx binutils binutils-2.17 perl texinfo gcc cvs +NO_CROSS+=groff binutils binutils-2.17 perl texinfo gcc cvs NO_CROSS+=nsd -NO_CROSS+=nginx NO_CROSS+=sqlite3 cross-dirs: ${CROSSDIRS} @@ -253,19 +249,23 @@ ln -sf ${TARGET_CANON}-cpp ${CROSSDIR}/usr/${TARGET_CANON}/bin/cpp .else (cd ${.CURDIR}/gnu/usr.bin/cc; \ + PIE_DEFAULT=${PIE_DEFAULT} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ CROSSDIR=${CROSSDIR} \ MACHINE=${TARGET} \ PATH=${CROSSPATH} ${MAKE} depend ) (cd ${.CURDIR}/gnu/usr.bin/cc; \ + PIE_DEFAULT=${PIE_DEFAULT} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ CROSSDIR=${CROSSDIR} \ MACHINE=${TARGET} \ ${MAKE} all ) (cd ${.CURDIR}/gnu/usr.bin/cc; \ - env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + env CROSSDIR=${CROSSDIR} DESTDIR=${CROSSDIR} \ + PIE_DEFAULT=${PIE_DEFAULT} \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ TARGET_ARCH=${TARGET_ARCH} TARGET_CPU=${TARGET_CPU} \ MACHINE=${TARGET} \ PATH=${CROSSPATH} ${MAKE} install)