===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.108
retrieving revision 1.111
diff -u -r1.108 -r1.111
--- src/Makefile	2004/11/30 15:46:01	1.108
+++ src/Makefile	2005/01/09 19:35:26	1.111
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.108 2004/11/30 15:46:01 mickey Exp $
+#	$OpenBSD: Makefile,v 1.111 2005/01/09 19:35:26 espie Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -237,15 +237,6 @@
 	ln -sf ${CROSSDIR}/usr/bin/strip \
 	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip
 .endif
-	(cd ${.CURDIR}/usr.bin/nm; \
-	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} NOMAN= depend all; \
-	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} NOMAN= install)
-	ln -sf ${CROSSDIR}/usr/bin/nm \
-	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm
-	ln -sf ${CROSSDIR}/usr/bin/size \
-	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/size
 	@for cmd in ${BINUTILS}; do \
 	 if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a \
 	 -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
@@ -267,8 +258,11 @@
 # bsd.own.mk can't do it for us
 .if ${TARGET} == "amd64" || ${TARGET} == "cats" || \
     ${TARGET} == "hppa" || ${TARGET} == "hppa64" || \
+    ${TARGET} == "i386" || \
     ${TARGET} == "sparc64" || ${TARGET} == "sgi"
 USE_GCC3=yes
+.else
+USE_GCC3=no
 .endif
 
 ${CROSSGCC}:		${CROSSBINUTILS}