[src/netbsd-1-5]: src/share/mk Update from trunk:

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/404da24c6353
branches:  netbsd-1-5
changeset: 488325:404da24c6353
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Thu Jun 29 23:35:08 2000 +0000

description:
Update from trunk:
For the case when DESTDIR is set: move the -L${DESTDIR}/usr/lib after
${LDADD} so any -L directories set in LDADD are searched first to avoid
possibly linking against old versions of libraries.

diffstat:

 share/mk/bsd.lib.mk  |  4 ++--
 share/mk/bsd.prog.mk |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 7f5173a4a274 -r 404da24c6353 share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Thu Jun 29 23:33:10 2000 +0000
+++ b/share/mk/bsd.lib.mk       Thu Jun 29 23:35:08 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.169 2000/06/19 19:35:05 thorpej Exp $
+#      $NetBSD: bsd.lib.mk,v 1.169.2.1 2000/06/29 23:35:08 thorpej Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .if !target(__initialized__)
@@ -308,8 +308,8 @@
        $(LD) -nostdlib -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
            ${SHLIB_LDSTARTFILE} \
            --whole-archive ${SOLIB} \
+           --no-whole-archive ${LDADD} \
            -L${DESTDIR}${LIBDIR} -R${LIBDIR} \
-           --no-whole-archive ${LDADD} \
            ${SHLIB_LDENDFILE}
 .else
        $(LD) -x -shared ${SHLIB_SHFLAGS} -o ${.TARGET} \
diff -r 7f5173a4a274 -r 404da24c6353 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Thu Jun 29 23:33:10 2000 +0000
+++ b/share/mk/bsd.prog.mk      Thu Jun 29 23:35:08 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.prog.mk,v 1.117 2000/06/19 19:00:14 thorpej Exp $
+#      $NetBSD: bsd.prog.mk,v 1.117.2.1 2000/06/29 23:35:09 thorpej Exp $
 #      @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
 
 .if !target(__initialized__)
@@ -116,7 +116,7 @@
 .if defined(DESTDIR)
 
 ${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD}
-       ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib -Wl,-rpath-link,${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -lgcc -lc -lgcc ${LIBCRTEND}
+       ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -Wl,-rpath-link,${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${DESTDIR}/usr/lib -lgcc -lc -lgcc ${LIBCRTEND}
 
 .else