diff options
author | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-03-08 16:12:55 +0000 |
---|---|---|
committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2016-03-08 16:12:55 +0000 |
commit | c12b4204c6e770fb2494adff8d233c9dd3bd7ca2 (patch) | |
tree | 22fc4a5ff41108c29345fde4de0ef7d02cee604c /share | |
parent | 91f514e41310363313cdaaed929d201d2a689b8e (diff) | |
download | src-c12b4204c6e770fb2494adff8d233c9dd3bd7ca2.tar.gz src-c12b4204c6e770fb2494adff8d233c9dd3bd7ca2.zip |
Follow-up r296324: Fix STATICOBJS dependency guesses conditions.
Reported by: antoine
Pointyhat to: bdrewery
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=296506
Diffstat (limited to 'share')
-rw-r--r-- | share/mk/bsd.lib.mk | 4 |
1 files 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 <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> |