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.prog.mk,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -p -r1.215 -r1.216
--- src/share/mk/bsd.prog.mk	2006/07/23 11:41:27	1.215
+++ src/share/mk/bsd.prog.mk	2006/10/09 08:32:11	1.216
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.215 2006/07/23 11:41:27 lukem Exp $
+#	$NetBSD: bsd.prog.mk,v 1.216 2006/10/09 08:32:11 mrg Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -97,11 +97,17 @@ PAM_STATIC_LDADD=
 PAM_STATIC_DPADD=
 .endif
 
+# These need + -> X transformations
 .ifndef LIBSTDCXX
 LIBSTDCXX=	${DESTDIR}/usr/lib/libstdc++.a
 .MADE:		${LIBSTDCXX}
 .endif
 
+.ifndef LIBSUPCXX
+LIBSUPCXX=	${DESTDIR}/usr/lib/libsupc++.a
+.MADE:		${LIBSUPCXX}
+.endif
+
 .for _lib in \
 	dps expat fntstubs fontcache fontconfig fontenc freetype FS \
 	GL GLU ICE lbxutil SM X11 Xau Xaw Xdmcp Xext Xfont Xft \
@@ -172,11 +178,6 @@ _PROGLDOPTS+=	-Wl,-rpath-link,${DESTDIR}
 
 .if defined(PROG_CXX)
 _CCLINK=	${CXX}
-.if ${USE_LIBSTDCXX} == "no"
-_SUPCXX=	-lsupc++ -lm
-.else
-_SUPCXX=	-lstdc++ -lm
-.endif
 .else
 _CCLINK=	${CC}
 .endif