Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use ${BFD_MACHINE_ARCH} in preference to ${MACHINE_ARCH}, if defined.

This commit is contained in:
mrg 2008-10-25 23:56:02 +00:00
parent f6382710ee
commit 3fde6715d8
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gnu/lib/libbfd/Makefile
View File

@ -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} \

12
gnu/lib/libopcodes/Makefile
View File

@ -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.*}