From 6c296318c2c39e8b41f852a0931b06b8e2bd33a3 Mon Sep 17 00:00:00 2001 From: drahn <> Date: Mon, 8 Mar 2004 23:31:51 +0000 Subject: [PATCH] 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@ --- src/include/Makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/include/Makefile b/src/include/Makefile index 99cbe780..3a13a555 100644 --- a/src/include/Makefile +++ b/src/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 \