Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v
rcsdiff: /ftp/cvs/cvsroot/src/share/mk/bsd.lib.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.272
retrieving revision 1.274
diff -u -p -r1.272 -r1.274
--- src/share/mk/bsd.lib.mk	2007/09/15 14:36:14	1.272
+++ src/share/mk/bsd.lib.mk	2008/04/26 20:03:44	1.274
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.272 2007/09/15 14:36:14 christos Exp $
+#	$NetBSD: bsd.lib.mk,v 1.274 2008/04/26 20:03:44 christos Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -139,15 +139,6 @@ CPPPICFLAGS?= -DPIC -DBIGPIC
 CAPICFLAGS?= ${CPPPICFLAGS} ${CPICFLAGS}
 APICFLAGS ?= -KPIC
 
-.elif ${MACHINE_ARCH} == "ns32k"					# } {
-
-# XXX no shared libraries yet on ns32k
-FPICFLAGS?=
-CPICFLAGS?=
-CPPPICFLAGS?=
-CAPICFLAGS?=
-APICFLAGS?=
-
 .else									# } {
 
 # Platform-independent flags for NetBSD shared libraries
@@ -450,7 +441,12 @@ _LIBLDOPTS+=	-Wl,-rpath-link,${DESTDIR}$
 		-L${DESTDIR}${SHLIBINSTALLDIR}
 .endif
 
-lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} \
+.if ${LIB} != "c"
+DPLIBC ?= ${DESTDIR}${LIBC_SO}
+LDLIBC ?= -lc
+.endif
+
+lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOLIB} ${DPADD} ${DPLIBC} \
     ${SHLIB_LDSTARTFILE} ${SHLIB_LDENDFILE}
 	${_MKTARGET_BUILD}
 	rm -f lib${LIB}.so.${SHLIB_FULLVERSION}
@@ -460,11 +456,12 @@ lib${LIB}.so.${SHLIB_FULLVERSION}: ${SOL
 	    -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \
 	    -Wl,--whole-archive ${SOLIB} \
 	    -Wl,--no-whole-archive ${LDADD} \
-	    -L${_GCC_LIBGCCDIR}
+	    -L${_GCC_LIBGCCDIR} ${LDLIBC}
 .else
 	${CC} -Wl,-x -shared ${SHLIB_SHFLAGS} ${LDFLAGS} -o ${.TARGET} \
 	    ${_LIBLDOPTS} \
-	    -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD}
+	    -Wl,--whole-archive ${SOLIB} -Wl,--no-whole-archive ${LDADD} \
+	    ${LDLIBC}
 .endif
 .if ${OBJECT_FMT} == "ELF"
 #  We don't use INSTALL_SYMLINK here because this is just