===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/share/mk/bsd.prog.mk,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- src/share/mk/bsd.prog.mk	2004/06/03 20:51:07	1.39
+++ src/share/mk/bsd.prog.mk	2004/10/13 16:47:50	1.40
@@ -1,4 +1,4 @@
-#	$OpenBSD: bsd.prog.mk,v 1.39 2004/06/03 20:51:07 miod Exp $
+#	$OpenBSD: bsd.prog.mk,v 1.40 2004/10/13 16:47:50 espie Exp $
 #	$NetBSD: bsd.prog.mk,v 1.55 1996/04/08 21:19:26 jtc Exp $
 #	@(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
 
@@ -106,28 +106,24 @@
 
 .if defined(PROG)
 SRCS?=	${PROG}.c
-.if !empty(SRCS:N*.h:N*.sh)
+.  if !empty(SRCS:N*.h:N*.sh)
 OBJS+=	${SRCS:N*.h:N*.sh:R:S/$/.o/g}
 LOBJS+=	${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln}
-.endif
+.  endif
 
-.if defined(OBJS) && !empty(OBJS)
-.if defined(DESTDIR)
-
+.  if defined(OBJS) && !empty(OBJS)
+.    if !empty(SRCS:M*.C) || !empty(SRCS:M*.cc) || !empty(SRCS:M*.cxx)
 ${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${CRTBEGIN} ${CRTEND} ${DPADD}
-	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -L${DESTDIR}/usr/lib ${LIBCRT0} ${CRTBEGIN} ${OBJS} ${LDADD} -lgcc -lc -lgcc ${CRTEND}
-
-.else
-
+	${CXX} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -B${DESTDIR}/usr/lib ${OBJS} ${LDADD}
+.    else
 ${PROG}: ${LIBCRT0} ${OBJS} ${LIBC} ${CRTBEGIN} ${CRTEND} ${DPADD}
-	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD}
+	${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -B${DESTDIR}/usr/lib ${OBJS} ${LDADD}
+.    endif
+.  endif	# defined(OBJS) && !empty(OBJS)
 
-.endif	# defined(DESTDIR)
-.endif	# defined(OBJS) && !empty(OBJS)
-
-.if	!defined(MAN)
+.  if	!defined(MAN)
 MAN=	${PROG}.1
-.endif	# !defined(MAN)
+.  endif	# !defined(MAN)
 .endif	# defined(PROG)
 
 .MAIN: all