summaryrefslogtreecommitdiff
path: root/gnu/lib
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2008-10-25 23:56:02 +0000
committermrg <mrg@NetBSD.org>2008-10-25 23:56:02 +0000
commit3fde6715d8d0501d65fa1fd97c5b0014557fd7ce (patch)
tree9b0b68fc99f2379507d8b3917b5b80598070fe09 /gnu/lib
parentf6382710ee6040825065fe1e11b3644da197dcf7 (diff)
use ${BFD_MACHINE_ARCH} in preference to ${MACHINE_ARCH}, if defined.
Diffstat (limited to 'gnu/lib')
-rw-r--r--gnu/lib/libbfd/Makefile10
-rw-r--r--gnu/lib/libopcodes/Makefile12
2 files changed, 13 insertions, 9 deletions
diff --git a/gnu/lib/libbfd/Makefile b/gnu/lib/libbfd/Makefile
index 20b68842a4f..313425ba032 100644
--- a/gnu/lib/libbfd/Makefile
+++ b/gnu/lib/libbfd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2008/10/25 22:27:35 apb Exp $
+# $NetBSD: Makefile,v 1.45 2008/10/25 23:56:02 mrg Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -17,8 +17,10 @@ libinstall: # do nothing
LIB= bfd
-.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk)
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+BFD_MACHINE_ARCH?= ${MACHINE_ARCH}
+
+.if exists(${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk)
+.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
DIST= ${NETBSDSRCDIR}/gnu/dist/binutils
@@ -26,7 +28,7 @@ SHLIB_MAJOR= 9
SHLIB_MINOR= 0
GCPPFLAGS= ${G_archdefs} ${G_DEFS} ${G_INCLUDES} ${G_TDEFAULTS}
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} -I${DIST}/include -I. \
+CPPFLAGS+= -I${.CURDIR}/arch/${BFD_MACHINE_ARCH} -I${DIST}/include -I. \
-I${DIST}/bfd ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*}
GSRCS= ${G_libbfd_la_OBJECTS:libbfd.lo=lib_bfd.lo} \
diff --git a/gnu/lib/libopcodes/Makefile b/gnu/lib/libopcodes/Makefile
index 98c027e5d75..c67db6b2487 100644
--- a/gnu/lib/libopcodes/Makefile
+++ b/gnu/lib/libopcodes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/02/03 16:30:13 christos Exp $
+# $NetBSD: Makefile,v 1.5 2008/10/25 23:56:02 mrg Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -9,8 +9,10 @@ NOPROFILE= # defined
LIB= opcodes
-.if exists(${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk)
-.include "${.CURDIR}/arch/${MACHINE_ARCH}/defs.mk"
+BFD_MACHINE_ARCH?= ${MACHINE_ARCH}
+
+.if exists(${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk)
+.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
DIST= ${NETBSDSRCDIR}/gnu/dist/binutils
@@ -18,8 +20,8 @@ SHLIB_MAJOR= 2
SHLIB_MINOR= 0
GCPPFLAGS= ${G_archdefs} ${G_DEFS} ${G_INCLUDES} ${G_TDEFAULTS}
-CPPFLAGS+= -I${.CURDIR}/arch/${MACHINE_ARCH} \
- -I${.CURDIR}/../libbfd/arch/${MACHINE_ARCH} \
+CPPFLAGS+= -I${.CURDIR}/arch/${BFD_MACHINE_ARCH} \
+ -I${.CURDIR}/../libbfd/arch/${BFD_MACHINE_ARCH} \
-I${DIST}/include -I. \
-I${DIST}/bfd ${GCPPFLAGS:M-D*} \
${GCPPFLAGS:M-I*:N-I.*}