Date: Tue, 8 Mar 2016 16:12:55 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r296506 - head/share/mk Message-ID: <201603081612.u28GCtGq029857@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Tue Mar 8 16:12:55 2016 New Revision: 296506 URL: https://svnweb.freebsd.org/changeset/base/296506 Log: Follow-up r296324: Fix STATICOBJS dependency guesses conditions. Reported by: antoine Pointyhat to: bdrewery Sponsored by: EMC / Isilon Storage Division Modified: head/share/mk/bsd.lib.mk Modified: head/share/mk/bsd.lib.mk ============================================================================== --- head/share/mk/bsd.lib.mk Tue Mar 8 16:11:59 2016 (r296505) +++ head/share/mk/bsd.lib.mk Tue Mar 8 16:12:55 2016 (r296506) @@ -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}. .endfor .endif .endif -.endif .include <bsd.clang-analyze.mk> .include <bsd.obj.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603081612.u28GCtGq029857>