Browse files

bsd.prog.mk: Avoid redefining $PROG target

In rare cases, the PROG target is intentionally redefined before
including bsd.prog.mk, but when that happens a target redefinition
warning is emitting.  This adds a check for a pre-existing $PROG
target before attempting to define it.

It stops warnings from being emitted when loader and loader_tftp
are built.
  • Loading branch information...
1 parent 58700ca commit b4061d6cf8a3f9e959e064a3b5127b0172117fe6 John Marino committed with Sascha Wildner Oct 4, 2012
Showing with 2 additions and 0 deletions.
  1. +2 −0 share/mk/bsd.prog.mk
View
2 share/mk/bsd.prog.mk
@@ -32,12 +32,14 @@ LDADD+= ${OBJCLIBS}
OBJS+= ${SRCS:N*.h:N*.patch:R:S/$/.o/g}
+.if !target(${PROG})
${PROG}: ${OBJS}
.if defined(PROG_CXX)
${CXX_LINK} ${CXXFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
.else
${CC_LINK} ${CFLAGS} ${LDFLAGS} -o ${.TARGET} ${OBJS} ${LDADD}
.endif
+.endif
.else # !defined(SRCS)

0 comments on commit b4061d6

Please sign in to comment.