From owner-svn-src-all@freebsd.org Wed Jun 15 23:57:51 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BA1FDA47533; Wed, 15 Jun 2016 23:57:51 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 71DAC11C9; Wed, 15 Jun 2016 23:57:51 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5FNvokW075642; Wed, 15 Jun 2016 23:57:50 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5FNvorj075640; Wed, 15 Jun 2016 23:57:50 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201606152357.u5FNvorj075640@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Wed, 15 Jun 2016 23:57:50 +0000 (UTC) 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 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Jun 2016 23:57:51 -0000 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