Date: Wed, 15 Jun 2016 23:57:50 +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: r301935 - in head: share/mk sys/conf Message-ID: <201606152357.u5FNvorj075640@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Wed Jun 15 23:57:50 2016 New Revision: 301935 URL: https://svnweb.freebsd.org/changeset/base/301935 Log: WITH_META_MODE: Do include headers for specific guessed dependencies 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 Modified: head/share/mk/bsd.dep.mk head/sys/conf/kern.post.mk Modified: head/share/mk/bsd.dep.mk ============================================================================== --- head/share/mk/bsd.dep.mk Wed Jun 15 23:57:46 2016 (r301934) +++ head/share/mk/bsd.dep.mk Wed Jun 15 23:57:50 2016 (r301935) @@ -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 Modified: head/sys/conf/kern.post.mk ============================================================================== --- head/sys/conf/kern.post.mk Wed Jun 15 23:57:46 2016 (r301934) +++ head/sys/conf/kern.post.mk Wed Jun 15 23:57:50 2016 (r301935) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606152357.u5FNvorj075640>