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

WITH_META_MODE: Do include headers for specific guessed dependencies

Browse Source 
This is a follow-up to r300343.

This is important for the OBJS_DEPEND_GUESS usage in
gnu/usr.bin/cc/cc_tools.

See comments for more details.

Approved by:	re (implicit)
Sponsored by:	EMC / Isilon Storage Division
This commit is contained in:
Bryan Drewery 2016-06-15 23:57:50 +00:00
parent d04dec453a
commit c155decc4b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -221,9 +221,11 @@ ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
.elif defined(_meta_filemon)
# For meta mode we still need to know which file to depend on to avoid
# ambiguous suffix transformation rules from .PATH. Meta mode does not
# use .depend files. We really only need source files, not headers.
# use .depend files. We really only need source files, not headers since
# they are typically in SRCS/beforebuild already. For target-specific
# guesses do include headers though since they may not be in SRCS.
${__obj}: ${OBJS_DEPEND_GUESS:N*.h}
${__obj}: ${OBJS_DEPEND_GUESS.${__obj}:N*.h}
${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
.endif
.endfor

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

@ -254,11 +254,13 @@ ${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
.elif defined(_meta_filemon)
# For meta mode we still need to know which file to depend on to avoid
# ambiguous suffix transformation rules from .PATH. Meta mode does not
# use .depend files. We really only need source files, not headers.
# use .depend files. We really only need source files, not headers since
# they are typically in SRCS/beforebuild already. For target-specific
# guesses do include headers though since they may not be in SRCS.
.if ${SYSTEM_OBJS:M${__obj}}
${__obj}: ${OBJS_DEPEND_GUESS:N*.h}
.endif
${__obj}: ${OBJS_DEPEND_GUESS.${__obj}:N*.h}
${__obj}: ${OBJS_DEPEND_GUESS.${__obj}}
.endif
.endfor