From b4061d6cf8a3f9e959e064a3b5127b0172117fe6 Mon Sep 17 00:00:00 2001 From: John Marino Date: Thu, 4 Oct 2012 18:17:47 +0200 Subject: [PATCH] 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. --- share/mk/bsd.prog.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index ecaca31b3d..f6567bd820 100644 --- a/share/mk/bsd.prog.mk +++ b/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) -- 2.41.0