summaryrefslogtreecommitdiff
path: root/gnu/usr.bin
diff options
context:
space:
mode:
authortv <tv@NetBSD.org>1998-07-25 18:58:42 +0000
committertv <tv@NetBSD.org>1998-07-25 18:58:42 +0000
commit8f87ff5686bf846c8abe7f1654c23a7d076cd1ce (patch)
treeed49e25457f7a4d4354f708bd95aaeda7b117323 /gnu/usr.bin
parent50f955ff4970fe917c14358e34954e455475e77e (diff)
Use the new MACHINE_GNU_ARCH to identify a GNU architecture name.
In c++filt, add real dependencies for underscore.c so it isn't rebuilt every time.
Diffstat (limited to 'gnu/usr.bin')
-rw-r--r--gnu/usr.bin/binutils/Makefile.inc9
-rw-r--r--gnu/usr.bin/binutils/c++filt/Makefile10
2 files changed, 7 insertions, 12 deletions
diff --git a/gnu/usr.bin/binutils/Makefile.inc b/gnu/usr.bin/binutils/Makefile.inc
index 06196f170b1..93f318d78fc 100644
--- a/gnu/usr.bin/binutils/Makefile.inc
+++ b/gnu/usr.bin/binutils/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 1998/05/22 02:23:42 tv Exp $
+# $NetBSD: Makefile.inc,v 1.3 1998/07/25 18:58:42 tv Exp $
.if !defined(__MAKEFILE_INC_INCLUDED__)
__MAKEFILE_INC_INCLUDED__=1
@@ -15,12 +15,7 @@ VERSION=2.8.1
DIST_NAME=binutils-${VERSION}
# Override this to make cross tools. (Not yet guaranteed.)
-.if (${MACHINE_ARCH} == "arm32")
-# XXX. We need a better system for mapping NetBSD arch -> GNU arch.
-TARGET_ARCH?=arm
-.else
-TARGET_ARCH?=${MACHINE_ARCH}
-.endif
+TARGET_ARCH?=${MACHINE_GNU_ARCH}
# XXX. Need to pull proper target definition from <bsd.own.mk>.
.include <bsd.own.mk>
diff --git a/gnu/usr.bin/binutils/c++filt/Makefile b/gnu/usr.bin/binutils/c++filt/Makefile
index 56a2a28b2ea..35a4a6a2f66 100644
--- a/gnu/usr.bin/binutils/c++filt/Makefile
+++ b/gnu/usr.bin/binutils/c++filt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1998/05/28 20:52:26 cgd Exp $
+# $NetBSD: Makefile,v 1.4 1998/07/25 18:58:43 tv Exp $
PROG= c++filt
SRCS= cplus-dem.c underscore.c
@@ -7,12 +7,12 @@ CPPFLAGS+=-DMAIN -DVERSION='"${VERSION}"'
CLEANFILES+=underscore.c ${PROG}.1
-underscore.c: .PHONY
- sh ${.CURDIR}/mkunderscore.sh ${TARGET_ARCH}-unknown-netbsd ${TOP}/dist/bfd/config.bfd > \
- ${.TARGET}
-
.include <bsd.prog.mk>
+underscore.c: mkunderscore.sh ${dist}/bfd/config.bfd
+ sh ${.CURDIR}/mkunderscore.sh ${MACHINE_GNU_ARCH}-unknown-netbsd \
+ ${dist}/bfd/config.bfd > ${.TARGET}
+
.PATH: ${dist}/libiberty
${PROG}.1: ${srcdir}/cxxfilt.man