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.338
retrieving revision 1.344
diff -u -p -r1.338 -r1.344
--- src/share/mk/bsd.lib.mk	2013/09/12 15:36:16	1.338
+++ src/share/mk/bsd.lib.mk	2013/12/16 21:34:16	1.344
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.338 2013/09/12 15:36:16 joerg Exp $
+#	$NetBSD: bsd.lib.mk,v 1.344 2013/12/16 21:34:16 matt Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -589,7 +589,7 @@ DPLIBC ?= ${DESTDIR}${LIBC_SO}
 .endif
 .else
 LDLIBC ?= -nodefaultlibs
-.if ${LIB} == "c"
+.if ${HAVE_LIBGCC} == "yes" && ${LIB} == "c"
 LDADD+= -lgcc
 .endif
 .endif
@@ -597,6 +597,13 @@ LDADD+= -lgcc
 
 .if ${LIBISCXX} != "no"
 LIBCC:=	${CXX}
+. if ${MKLIBCXX} == "yes"
+LIBDPLIBS+=     c++	${.CURDIR}/../../../../../external/bsd/libc++/lib
+. elif defined(HAVE_GCC) && ${HAVE_GCC} == 4
+LIBDPLIBS+=     stdc++	${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
+. else
+LIBDPLIBS+=     stdc++	${.CURDIR}/../../../../../external/gpl3/gcc/lib/libstdc++-v3
+. endif
 .else
 LIBCC:=	${CC}
 .endif