Don't try to get libc_pic from the libc compile directory. If we're doing a

build, libc has already been installed.

libexec/ld.elf_so/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.30 1999/07/05 17:55:34 thorpej Exp $
+#	$NetBSD: Makefile,v 1.31 2000/03/26 21:55:55 mycroft Exp $
 
 .include <bsd.own.mk>			# for OBJECT_FMT definition
 
@@ -22,9 +22,6 @@ PROG=	ld.elf_so
 .include "$M/Makefile.inc"
 .endif
 
-CLIBOBJ!=cd ${.CURDIR}/../../lib/libc; \
-	printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-
 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
 CPPFLAGS+= -Wall -DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\"
@@ -33,7 +30,7 @@ CPPFLAGS+= -DDEBUG -DRTLD_LOADER
 CPPFLAGS+= -D_RTLD_SOURCE
 #CPPFLAGS+= -DRTLD_DEBUG -DRTLD_DEBUG_RELOC
 
-LDADD+=	-L${DESTDIR}/${LIBDIR} -L${CLIBOBJ} -non_shared -lc_pic
+LDADD+=	-non_shared -L${DESTDIR}/${LIBDIR} -lc_pic
 DPADD+=	${LIBC_PIC}
 
 STRIPFLAG=

libexec/ld.elf_so/arch/mips/ld.so.script

@@ -1,11 +1,10 @@
-/*	$NetBSD: ld.so.script,v 1.1 1998/03/25 04:12:32 mhitch Exp $ */
+/*	$NetBSD: ld.so.script,v 1.2 2000/03/26 21:55:55 mycroft Exp $ */
 
 /*  ldscript for MIPS ld.elf_so */
 OUTPUT_FORMAT("elf32-littlemips", "elf32-bigmips",
 	      "elf32-littlemips")
 OUTPUT_ARCH(mips)
 ENTRY(_start)
-SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/mips-dec-netbsd/lib);
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
 SECTIONS

libexec/ld.elf_so/arch/powerpc/ld.so.script

@@ -1,10 +1,9 @@
-/*	$NetBSD: ld.so.script,v 1.1 1998/11/24 11:34:31 tsubai Exp $	*/
+/*	$NetBSD: ld.so.script,v 1.2 2000/03/26 21:55:56 mycroft Exp $	*/
 
 OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc",
 	      "elf32-powerpc")
 OUTPUT_ARCH(powerpc)
 ENTRY(_start)
-SEARCH_DIR(/usr/lib);
 /* Do we need any of these for elf?
    __DYNAMIC = 0;    */
 PROVIDE (__stack = 0);