There is need to have a special BINUTIL_ARCH when we can use our more

common place TARGET_ARCH.

3 files changed, 9 insertions, 18 deletions

diff --git a/gnu/usr.bin/binutils/Makefile.inc0 b/gnu/usr.bin/binutils/Makefile.inc0
index b25e70b..50a1357 100644
--- a/gnu/usr.bin/binutils/Makefile.inc0
+++ b/gnu/usr.bin/binutils/Makefile.inc0
@@ -8,7 +8,6 @@ VERSION=	"2.12.1 [FreeBSD] 2002-07-20"
 VERSION_DATE=	20020720
 
 TARGET_ARCH?=	${MACHINE_ARCH}
-BINUTIL_ARCH=	${TARGET_ARCH}
 
 # RELTOP is the relative path to this point in the source or object
 # tree, from any subdirectory of same.  It gets extra "../" prefixes
@@ -23,18 +22,18 @@ WARNS=	2
 .endif
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I.
-.if exists(${.CURDIR}/${BINUTIL_ARCH})
-CFLAGS+= -I${.CURDIR}/${BINUTIL_ARCH}
+.if exists(${.CURDIR}/${TARGET_ARCH})
+CFLAGS+= -I${.CURDIR}/${TARGET_ARCH}
 .endif
 CFLAGS+= -I${.CURDIR}
-CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd/${BINUTIL_ARCH}
+CFLAGS+= -I${.CURDIR}/${RELTOP}/libbfd/${TARGET_ARCH}
 CFLAGS+= -I${SRCDIR}/include
 
-.if exists(${.CURDIR}/${BINUTIL_ARCH})
-.PATH: ${.CURDIR}/${BINUTIL_ARCH}
+.if exists(${.CURDIR}/${TARGET_ARCH})
+.PATH: ${.CURDIR}/${TARGET_ARCH}
 .endif
 
-ARCHS=	${BINUTIL_ARCH}
+ARCHS=	${TARGET_ARCH}
 
 .for _arch in ${CROSS_ARCH}
 .if (${ARCHS:R:M${_arch:R}} == "")
diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile
index ec92738..bb3ef33 100644
--- a/gnu/usr.bin/binutils/as/Makefile
+++ b/gnu/usr.bin/binutils/as/Makefile
@@ -2,7 +2,7 @@
 
 .include "${.CURDIR}/../Makefile.inc0"
 
-GASES=	${BINUTIL_ARCH}
+GASES=	${TARGET_ARCH}
 FORMATS=freebsd
 
 # Only build the cross tools when not cross-compiling.
diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile
index 43c6c7f..5daddd3 100644
--- a/gnu/usr.bin/binutils/libbfd/Makefile
+++ b/gnu/usr.bin/binutils/libbfd/Makefile
@@ -19,16 +19,8 @@ CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
 INTERNALLIB=	true
 CLEANFILES+=	config.h targmatch.h
 
-# If set, BINUTILSDISTDIR is the path to a directory containing the full GNU
-# binutils release. FreeBSD only distributes the bits that are required to
-# build native architectures. BINUTILSDISTDIR is needed to build cross tools.
-.if defined(BINUTILSDISTDIR) && exists(${BINUTILSDISTDIR})
-.PATH: ${BINUTILSDISTDIR}/bfd ${BINUTILSDISTDIR}/opcodes
-CFLAGS+= -I${BINUTILSDISTDIR}/bfd -I${BINUTILSDISTDIR}/include -I.
-.endif
-
 SELARCH=
-.if ${BINUTIL_ARCH} == "sparc64"
+.if ${TARGET_ARCH} == "sparc64"
 SELARCH= &bfd_sparc_arch
 .else
 .for _a in ${ARCHS}
@@ -55,7 +47,7 @@ targmatch.h: targmatch.sed config.bfd
 	sed -f ${.ALLSRC:M*.sed} ${.ALLSRC:M*.bfd} > ${.TARGET}
 	
 config.h: config.h.fbsd
-.if ${BINUTIL_ARCH} == "i386"
+.if ${TARGET_ARCH} == "i386"
 	sed -e 's,!!TRAD_HEADER!!,"hosts/i386bsd.h",g' ${.ALLSRC} > ${.TARGET}
 .else
 	sed -e 's,!!TRAD_HEADER!!,,g' ${.ALLSRC} > ${.TARGET}