summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2016-03-08 16:12:55 +0000
committerbdrewery <bdrewery@FreeBSD.org>2016-03-08 16:12:55 +0000
commit28359409cf17dc3f024711393e84f54d7096eb8b (patch)
tree22fc4a5ff41108c29345fde4de0ef7d02cee604c
parent82003e4255c1c5364d130098d840d1c97cf76aaa (diff)
downloadFreeBSD-src-28359409cf17dc3f024711393e84f54d7096eb8b.zip
FreeBSD-src-28359409cf17dc3f024711393e84f54d7096eb8b.tar.gz
Follow-up r296324: Fix STATICOBJS dependency guesses conditions.
Reported by: antoine Pointyhat to: bdrewery Sponsored by: EMC / Isilon Storage Division
-rw-r--r--share/mk/bsd.lib.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index b142a09..51fb828 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -432,12 +432,13 @@ OBJS_DEPEND_GUESS.${_S:R}.So= ${_S}
.include <bsd.dep.mk>
-.if defined(LIB) && !empty(LIB)
.if ${MK_FAST_DEPEND} == "no" && !exists(${.OBJDIR}/${DEPENDFILE})
+.if defined(LIB) && !empty(LIB)
${OBJS} ${STATICOBJS} ${POBJS}: ${OBJS_DEPEND_GUESS}
.for _S in ${SRCS:N*.[hly]}
${_S:R}.po: ${OBJS_DEPEND_GUESS.${_S:R}.po}
.endfor
+.endif
.if defined(SHLIB_NAME) || \
defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
${SOBJS}: ${OBJS_DEPEND_GUESS}
@@ -446,7 +447,6 @@ ${_S:R}.So: ${OBJS_DEPEND_GUESS.${_S:R}.So}
.endfor
.endif
.endif
-.endif
.include <bsd.clang-analyze.mk>
.include <bsd.obj.mk>
OpenPOWER on IntegriCloud