d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Slightly simplify logic for which depend file is expected.

Browse Source 
This is a NOP.

MFC after:	2 weeks
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-07-24 23:32:36 +00:00
parent cd2831005b
commit 711019f70d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=321440
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
share/mk/bsd.dep.mk
View File

@ -240,8 +240,12 @@ _meta_obj= ${.OBJDIR:C,/,_,g}_${__obj:C,/,_,g}.meta
_meta_obj= ${__obj}.meta
.endif
_dep_obj= ${DEPENDFILE}.${__obj:${DEPEND_FILTER}}
.if (defined(_meta_filemon) && !exists(${.OBJDIR}/${_meta_obj})) || \
(!defined(_meta_filemon) && !exists(${.OBJDIR}/${_dep_obj}))
.if defined(_meta_filemon)
_depfile= ${.OBJDIR}/${_meta_obj}
.else
_depfile= ${.OBJDIR}/${_dep_obj}
.endif
.if !exists(${_depfile})
${__obj}: ${OBJS_DEPEND_GUESS}
${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
.elif defined(_meta_filemon)
@ -252,7 +256,7 @@ ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
# guesses do include headers though since they may not be in SRCS.
${__obj}: ${OBJS_DEPEND_GUESS:N*.h}
${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
.endif
.endif # !exists(${_depfile})
.endfor
# Always run 'make depend' to generate dependencies early and to avoid the

10
sys/conf/kern.post.mk
View File

@ -259,8 +259,12 @@ beforebuild: kernel-depend
# For meta+filemon the .meta file is checked for since it is the dependency
# file used.
.for __obj in ${DEPENDOBJS:O:u}
.if (defined(_meta_filemon) && !exists(${.OBJDIR}/${__obj}.meta)) || \
(!defined(_meta_filemon) && !exists(${.OBJDIR}/.depend.${__obj}))
.if defined(_meta_filemon)
_depfile= ${.OBJDIR}/${__obj}.meta
.else
_depfile= ${.OBJDIR}/.depend.${__obj}
.endif
.if !exists(${_depfile})
.if ${SYSTEM_OBJS:M${__obj}}
${__obj}: ${OBJS_DEPEND_GUESS}
.endif
@ -275,7 +279,7 @@ ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
${__obj}: ${OBJS_DEPEND_GUESS:N*.h}
.endif
${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
.endif
.endif # !exists(${_depfile})
.endfor
.NOPATH: .depend ${DEPENDFILES_OBJS}