Use LIBDPLIBS
This commit is contained in:
parent
a4bcc6237e
commit
276acf4a26
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile.prog,v 1.2 2013/02/14 00:53:30 matt Exp $
|
||||
# $NetBSD: Makefile.prog,v 1.3 2013/02/14 01:21:25 matt Exp $
|
||||
#
|
||||
# Common Makefile fragment for a binutils program.
|
||||
#
|
||||
@ -26,25 +26,13 @@ DPADD+= ${LIBINTL}
|
||||
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libopcodes*)
|
||||
OPCODESOBJ!= cd ${TOP}/${BFDSUBDIR}/libopcodes && ${PRINTOBJDIR}
|
||||
LDADD+= -L${OPCODESOBJ} -lopcodes
|
||||
.if ${MKPICLIB} != "no"
|
||||
DPADD+= ${OPCODESOBJ}/libopcodes_pic.a
|
||||
.elif ${MKPIC} != "no"
|
||||
DPADD+= ${OPCODESOBJ}/libopcodes.so
|
||||
.else
|
||||
DPADD+= ${OPCODESOBJ}/libopcodes.a
|
||||
.endif
|
||||
LIBDPLIBS+= -lopcodes ${OPCODEOBJ}
|
||||
.endif
|
||||
|
||||
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libbfd*)
|
||||
BFDOBJ!= cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
|
||||
LDADD+= -L${BFDOBJ} -lbfd
|
||||
.if ${MKPICLIB} != "no"
|
||||
DPADD+= ${BFDOBJ}/libbfd_pic.a
|
||||
.elif ${MKPIC} != "no"
|
||||
DPADD+= ${BFDOBJ}/libbfd.so
|
||||
.else
|
||||
DPADD+= ${BFDOBJ}/libbfd.a
|
||||
.endif
|
||||
LIBDPLIBS+= -lbfd ${BFDOBJ}
|
||||
.endif
|
||||
|
||||
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libiberty*)
|
||||
|
18
external/gpl3/binutils/usr.bin/gas/Makefile
vendored
18
external/gpl3/binutils/usr.bin/gas/Makefile
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.5 2013/02/14 00:53:30 matt Exp $
|
||||
# $NetBSD: Makefile,v 1.6 2013/02/14 01:21:25 matt Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -29,23 +29,11 @@ DPADD= ${LIBINTL}
|
||||
|
||||
OPCODESOBJ!= cd ${TOP}/${BFDSUBDIR}/libopcodes && ${PRINTOBJDIR}
|
||||
LDADD+= -L${OPCODESOBJ} -lopcodes
|
||||
.if ${MKPICLIB} != "no"
|
||||
DPADD+= ${OPCODESOBJ}/libopcodes_pic.a
|
||||
.elif ${MKPIC} != "no"
|
||||
DPADD+= ${OPCODESOBJ}/libopcodes.so
|
||||
.else
|
||||
DPADD+= ${OPCODESOBJ}/libopcodes.a
|
||||
.endif
|
||||
LIBDPLIBS+= -lopcodes ${OPCODESOBJ}
|
||||
|
||||
BFDOBJ!= cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
|
||||
LDADD+= -L${BFDOBJ} -lbfd
|
||||
.if ${MKPICLIB} != "no"
|
||||
DPADD+= ${BFDOBJ}/libbfd_pic.a
|
||||
.elif ${MKPIC} != "no"
|
||||
DPADD+= ${BFDOBJ}/libbfd.so
|
||||
.else
|
||||
DPADD+= ${BFDOBJ}/libbfd.a
|
||||
.endif
|
||||
LIBDPLIBS+= -lbfd ${BFDOBJ}
|
||||
|
||||
IBERTYOBJ!= cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
|
||||
LDADD+= -L${IBERTYOBJ} -liberty
|
||||
|
10
external/gpl3/binutils/usr.bin/ld/Makefile
vendored
10
external/gpl3/binutils/usr.bin/ld/Makefile
vendored
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.12 2013/02/14 00:53:30 matt Exp $
|
||||
# $NetBSD: Makefile,v 1.13 2013/02/14 01:21:25 matt Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -27,13 +27,7 @@ COPTS.ldgram.c = -Wno-stack-protector
|
||||
|
||||
BFDOBJ!= cd ${TOP}/${BFDSUBDIR}/libbfd && ${PRINTOBJDIR}
|
||||
LDADD+= -L${BFDOBJ} -lbfd
|
||||
.if ${MKPICLIB} != "no"
|
||||
DPADD+= ${BFDOBJ}/libbfd_pic.a
|
||||
.elif ${MKPIC} != "no"
|
||||
DPADD+= ${BFDOBJ}/libbfd.so
|
||||
.else
|
||||
DPADD+= ${BFDOBJ}/libbfd.a
|
||||
.endif
|
||||
LIBDPLIBS+= -lbfd ${BFDOBJ}
|
||||
|
||||
IBERTYOBJ!= cd ${TOP}/${BFDSUBDIR}/libiberty && ${PRINTOBJDIR}
|
||||
LDADD+= -L${IBERTYOBJ} -liberty
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.3 2013/02/14 00:53:31 matt Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2013/02/14 01:21:26 matt Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -14,10 +14,8 @@ MAN= dbsym.8
|
||||
|
||||
CPPFLAGS+= -I${BFDDIR} -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
|
||||
|
||||
.if !defined(HOSTPROG) && ${MKPICLIB} != "no"
|
||||
DPADD+= ${BFDDIR}/libbfd_pic.a
|
||||
.elif !defined(HOSTPROG) && ${MKPIC} != "no"
|
||||
DPADD+= ${BFDDIR}/libbfd.so
|
||||
.if !defined(HOSTPROG)
|
||||
LIBDPLIBS+= -lbfd ${BFDDIR}
|
||||
.else
|
||||
DPADD+= ${BFDDIR}/libbfd.a
|
||||
.endif
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $NetBSD: Makefile,v 1.3 2013/02/14 00:53:31 matt Exp $
|
||||
# $NetBSD: Makefile,v 1.4 2013/02/14 01:21:26 matt Exp $
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
||||
@ -14,10 +14,8 @@ MAN= mdsetimage.8
|
||||
|
||||
CPPFLAGS+= -I${BFDDIR} -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
|
||||
|
||||
.if !defined(HOSTPROG) && ${MKPICLIB} != "no"
|
||||
DPADD+= ${BFDDIR}/libbfd_pic.a
|
||||
.elif !defined(HOSTPROG) && ${MKPIC} != "no"
|
||||
DPADD+= ${BFDDIR}/libbfd.so
|
||||
.if !defined(HOSTPROG)
|
||||
LIBDPLIBS+= -lbfd ${BFDDIR}
|
||||
.else
|
||||
DPADD+= ${BFDDIR}/libbfd.a
|
||||
.endif
|
||||
|
Loading…
Reference in New Issue
Block a user