===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile.cross,v
retrieving revision 1.12
retrieving revision 1.15
diff -u -r1.12 -r1.15
--- src/Makefile.cross	2005/09/18 20:42:49	1.12
+++ src/Makefile.cross	2006/04/19 18:32:39	1.15
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.cross,v 1.12 2005/09/18 20:42:49 drahn Exp $
+# $OpenBSD: Makefile.cross,v 1.15 2006/04/19 18:32:39 miod Exp $
 
 cross-tools:	cross-includes cross-binutils cross-gcc cross-lib
 cross-distrib:	cross-tools cross-bin cross-etc-root-var
@@ -50,7 +50,7 @@
 CROSSBINUTILS=	${CROSSDIR}/usr/bin/.binutils_done
 CROSSGCC=	${CROSSDIR}/usr/bin/.gcc_done
 NO_CROSS=	isakmpd tn3270 less sudo openssl libkeynote libssl \
-		photurisd keynote sectok ssh
+		keynote sectok ssh
 
 # no libcrypto.... these won't build
 NO_CROSS+=	dc login_krb5 login_krb5-or-pwd passwd ppp tcpdump telnet
@@ -149,13 +149,17 @@
 	ln -sf ${CROSSDIR}/usr/bin/ld \
 	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/ld
 	(cd ${.CURDIR}/usr.bin/ar; \
+	    ELF_TOOLCHAIN=no \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
+	    ELF_TOOLCHAIN=no \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/ar \
 	    ${CROSSDIR}/usr/${TARGET_CANON}/bin/ar
 	(cd ${.CURDIR}/usr.bin/ranlib; \
+	    ELF_TOOLCHAIN=no \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
+	    ELF_TOOLCHAIN=no \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/ranlib \
@@ -248,11 +252,11 @@
 	    for lib in csu libc; do \
 	    (cd $$lib; \
 	        eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-		    ${MAKE} depend all install); \
+		    ${MAKE} WANTLINT=no depend all install); \
 	    done; \
 	    eval ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	        SKIPDIR=\"${NO_CROSS} libocurses/PSD.doc\" \
-	        ${MAKE} depend all install)
+	        ${MAKE} WANTLINT=no depend all install)
 
 cross-bin:	${CROSSOBJ}
 	MACHINE=${TARGET} MACHINE_ARCH=${TARGET_ARCH}; \