Do not build binutils on arm. ARM needs at least binutils 2.14.

Allows others to build OpenBSD/cats, use binutils from devel/binutils/stable
Requested by deraadt@

2 files changed, 14 insertions, 5 deletions

diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile
index ec8ac6ddc39..12136e26be5 100644
--- a/gnu/usr.bin/Makefile
+++ b/gnu/usr.bin/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.41 2004/01/23 18:21:13 espie Exp $
+#	$OpenBSD: Makefile,v 1.42 2004/03/08 23:31:51 drahn Exp $
 #	$NetBSD: Makefile,v 1.35 1996/04/03 21:20:52 chuck Exp $
 
 .include <bsd.own.mk>
@@ -14,7 +14,10 @@ SUBDIR+=	../egcs/gcc
 .  endif
 .endif
 
-SUBDIR+=	cxxfilt cvs groff lynx rcs sendbug binutils
+SUBDIR+=	cxxfilt cvs groff lynx rcs sendbug
+.if ${MACHINE_ARCH} != "arm"
+SUBDIR+=binutils
+.endif
 
 # most ports use binutils gas and ld, some do not (yet).
 .if ${ELF_TOOLCHAIN:L} == "no"
diff --git a/include/Makefile b/include/Makefile
index 99cbe780b33..3a13a5552ea 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.124 2004/03/01 02:59:56 drahn Exp $
+#	$OpenBSD: Makefile,v 1.125 2004/03/08 23:31:51 drahn Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -50,11 +50,17 @@ RDIRS=	../lib/libpthread ../lib/libcompat ../lib/libcurses \
 PRDIRS=
 
 # Directories with an includes target that use Makefile.bsd-wrapper
-WDIRS=	../usr.sbin/httpd ../gnu/usr.bin/binutils
+WDIRS=	../usr.sbin/httpd
+.if ${MACHINE_ARCH} != "arm"
+WDIRS+=	../gnu/usr.bin/binutils
+.endif
 
 # Places using Makefile.bsd-wrapper that needs a prerequisite target met
 # before includes
-PWDIRS=	../usr.sbin/httpd ../gnu/usr.bin/binutils
+PWDIRS=	../usr.sbin/httpd
+.if ${MACHINE_ARCH} != "arm"
+PWDIRS+=	../gnu/usr.bin/binutils
+.endif
 
 .if ${USE_GCC3:L} == "yes"
 WDIRS+= ../gnu/lib/libstdc++ ../gnu/usr.bin/gcc ../gnu/lib/libobjc \