From 28359409cf17dc3f024711393e84f54d7096eb8b Mon Sep 17 00:00:00 2001 From: bdrewery Date: Tue, 8 Mar 2016 16:12:55 +0000 Subject: [PATCH] Follow-up r296324: Fix STATICOBJS dependency guesses conditions. Reported by: antoine Pointyhat to: bdrewery Sponsored by: EMC / Isilon Storage Division --- share/mk/bsd.lib.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index b142a09b69cc..51fb828400a2 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 -.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 .include