[src/trunk]: src/libexec/ld.elf_so Revert rev. 1.30 (partly). If MKPICINSTAL...

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

details:   https://anonhg.NetBSD.org/src/rev/4d73c5c4d78f
branches:  trunk
changeset: 520206:4d73c5c4d78f
user:      tv <tv%NetBSD.org@localhost>
date:      Fri Jan 04 19:08:04 2002 +0000

description:
Revert rev. 1.30 (partly).  If MKPICINSTALL=no in mk.conf, libc_pic.a will
NOT be installed by the time we build here.

However, allow the link to look in both src/lib/libc and $DESTDIR/usr/lib.

diffstat:

 libexec/ld.elf_so/Makefile |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r b1e3f13271a0 -r 4d73c5c4d78f libexec/ld.elf_so/Makefile
--- a/libexec/ld.elf_so/Makefile        Fri Jan 04 19:07:18 2002 +0000
+++ b/libexec/ld.elf_so/Makefile        Fri Jan 04 19:08:04 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.43 2001/12/28 05:44:22 lukem Exp $
+#      $NetBSD: Makefile,v 1.44 2002/01/04 19:08:04 tv Exp $
 
 .include <bsd.own.mk>                  # for OBJECT_FMT definition
 
@@ -25,6 +25,8 @@
 .include "$M/Makefile.inc"
 .endif
 
+CLIBOBJ!=      cd ${.CURDIR}/../../lib/libc && ${PRINTOBJDIR}
+
 SRCS+= rtld.c reloc.c symbol.c malloc.c xmalloc.c xprintf.c debug.c \
        map_object.c load.c search.c headers.c paths.c
 
@@ -42,7 +44,7 @@
 CPPFLAGS+= -DRTLD_DEFAULT_LIBRARY_PATH=\"${SHLIBDIR}:${LIBDIR}\"
 .endif
 
-LDADD+=        -non_shared -L${DESTDIR}${LIBDIR} -lc_pic
+LDADD+=        -L${CLIBOBJ} -L${DESTDIR}${LIBDIR} -non_shared -lc_pic
 DPADD+=        ${LIBC_PIC}
 
 STRIPFLAG=