From c4a3a5ddb263fb4e0bead3c7be9f4b244fe5d54b Mon Sep 17 00:00:00 2001 From: christos Date: Sun, 14 Jan 2001 09:53:57 +0000 Subject: [PATCH] fix thinko: test for the existance of the target before we define it... --- share/mk/bsd.prog.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index 35321b0e7cc6..881b2a9230a5 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prog.mk,v 1.125 2001/01/14 09:40:35 christos Exp $ +# $NetBSD: bsd.prog.mk,v 1.126 2001/01/14 09:53:57 christos Exp $ # @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94 .if !target(__initialized__) @@ -119,17 +119,20 @@ LOBJS+= ${LSRCS:.c=.ln} ${SRCS:M*.c:.c=.ln} .if defined(OBJS) && !empty(OBJS) .NOPATH: ${OBJS} +.if !target(${PROG}) +__addcmds=yes +.endif .if defined(DESTDIR) ${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} -.if !target(${PROG}) +.if defined(__addcmds) ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} -nostdlib -Wl,-rpath-link,${DESTDIR}/usr/lib ${LIBCRT0} ${LIBCRTBEGIN} ${OBJS} ${LDADD} -L${DESTDIR}/usr/lib -lgcc -lc -lgcc ${LIBCRTEND} .endif .else ${PROG}: ${LIBCRT0} ${DPSRCS} ${OBJS} ${LIBC} ${LIBCRTBEGIN} ${LIBCRTEND} ${DPADD} -.if !target(${PROG}) +.if defined(__addcmds) ${CC} ${LDFLAGS} ${LDSTATIC} -o ${.TARGET} ${OBJS} ${LDADD} .endif