Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/gnu If ${MKPIC} is not "no", then depend on the _pic version...
details: https://anonhg.NetBSD.org/src/rev/af6a278cd636
branches: trunk
changeset: 545508:af6a278cd636
user: thorpej <thorpej%NetBSD.org@localhost>
date: Wed Apr 09 22:38:24 2003 +0000
description:
If ${MKPIC} is not "no", then depend on the _pic versions of libbfd
and libopcodes. Otherwise, depend on the regular library.
diffstat:
gnu/usr.bin/binutils/common/Makefile.prog | 10 +++++++++-
gnu/usr.sbin/dbsym/Makefile | 6 +++++-
gnu/usr.sbin/mdsetimage/Makefile | 6 +++++-
3 files changed, 19 insertions(+), 3 deletions(-)
diffs (73 lines):
diff -r 5147a32ea661 -r af6a278cd636 gnu/usr.bin/binutils/common/Makefile.prog
--- a/gnu/usr.bin/binutils/common/Makefile.prog Wed Apr 09 22:37:32 2003 +0000
+++ b/gnu/usr.bin/binutils/common/Makefile.prog Wed Apr 09 22:38:24 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.prog,v 1.4 2003/03/05 07:19:14 mrg Exp $
+# $NetBSD: Makefile.prog,v 1.5 2003/04/09 22:38:25 thorpej Exp $
#
# Common Makefile fragment for a binutils program.
#
@@ -26,13 +26,21 @@
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libopcodes*)
OPCODESOBJ!= cd ${TOP}/lib/libopcodes && ${PRINTOBJDIR}
LDADD+= -L${OPCODESOBJ} -lopcodes
+.if ${MKPIC} != "no"
DPADD+= ${OPCODESOBJ}/libopcodes_pic.a
+.else
+DPADD+= ${OPCODESOBJ}/libopcodes.a
+.endif
.endif
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libbfd*)
BFDOBJ!= cd ${TOP}/lib/libbfd && ${PRINTOBJDIR}
LDADD+= -L${BFDOBJ} -lbfd
+.if ${MKPIC} != "no"
DPADD+= ${BFDOBJ}/libbfd_pic.a
+.else
+DPADD+= ${BFDOBJ}/libbfd.a
+.endif
.endif
.if !empty(G_${BUPROG}_DEPENDENCIES:M*/libiberty*)
diff -r 5147a32ea661 -r af6a278cd636 gnu/usr.sbin/dbsym/Makefile
--- a/gnu/usr.sbin/dbsym/Makefile Wed Apr 09 22:37:32 2003 +0000
+++ b/gnu/usr.sbin/dbsym/Makefile Wed Apr 09 22:38:24 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/09/19 03:09:43 lukem Exp $
+# $NetBSD: Makefile,v 1.8 2003/04/09 22:38:24 thorpej Exp $
.include <bsd.own.mk>
@@ -13,7 +13,11 @@
CPPFLAGS+= -I${BFDDIR} -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
+.if !defined(HOSTPROG) && ${MKPIC} != "no"
+DPADD+= ${BFDDIR}/libbfd_pic.a
+.else
DPADD+= ${BFDDIR}/libbfd.a
+.endif
LDADD+= -L${BFDDIR} -lbfd
DPADD+= ${IBERTYDIR}/libiberty.a
diff -r 5147a32ea661 -r af6a278cd636 gnu/usr.sbin/mdsetimage/Makefile
--- a/gnu/usr.sbin/mdsetimage/Makefile Wed Apr 09 22:37:32 2003 +0000
+++ b/gnu/usr.sbin/mdsetimage/Makefile Wed Apr 09 22:38:24 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/09/19 03:09:43 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2003/04/09 22:38:25 thorpej Exp $
.include <bsd.own.mk>
@@ -13,7 +13,11 @@
CPPFLAGS+= -I${BFDDIR} -I${DIST}/bfd -I${DIST}/binutils -I${DIST}/include
+.if !defined(HOSTPROG) && ${MKPIC} != "no"
+DPADD+= ${BFDDIR}/libbfd_pic.a
+.else
DPADD+= ${BFDDIR}/libbfd.a
+.endif
LDADD+= -L${BFDDIR} -lbfd
DPADD+= ${IBERTYDIR}/libiberty.a
Home |
Main Index |
Thread Index |
Old Index