From owner-svn-src-all@freebsd.org Thu May 24 18:49:20 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF1B2EFB27B; Thu, 24 May 2018 18:49:20 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7D7797D4B2; Thu, 24 May 2018 18:49:20 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5EB5E16163; Thu, 24 May 2018 18:49:20 +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 w4OInKvA038468; Thu, 24 May 2018 18:49:20 GMT (envelope-from bdrewery@FreeBSD.org) Received: (from bdrewery@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4OInKV0038467; Thu, 24 May 2018 18:49:20 GMT (envelope-from bdrewery@FreeBSD.org) Message-Id: <201805241849.w4OInKV0038467@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to bdrewery@FreeBSD.org using -f From: Bryan Drewery Date: Thu, 24 May 2018 18:49:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334177 - head/share/mk X-SVN-Group: head X-SVN-Commit-Author: bdrewery X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 334177 X-SVN-Commit-Repository: base 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.26 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: Thu, 24 May 2018 18:49:21 -0000 Author: bdrewery Date: Thu May 24 18:49:19 2018 New Revision: 334177 URL: https://svnweb.freebsd.org/changeset/base/334177 Log: rescue: Restore 'make depend' call to fix WITH_META_MODE after r334008. The rescue/crunchgen build avoids linking binaries for the objects it is building by doing 'make foo.o bar.o' rather than 'make all'. This breaks the implicit 'beforebuild: depend' dependency which ensured that all source files were generated and up-to-date before building the object files. This manifested as a WITH_META_MODE build problem for bin/sh in the rescue build with syntax.{c,h} not properly being regenerated or recognized as changed in the dependency graph. Sponsored by: Dell EMC MFC after: 1 week Reported by: many Modified: head/share/mk/bsd.crunchgen.mk Modified: head/share/mk/bsd.crunchgen.mk ============================================================================== --- head/share/mk/bsd.crunchgen.mk Thu May 24 18:32:54 2018 (r334176) +++ head/share/mk/bsd.crunchgen.mk Thu May 24 18:49:19 2018 (r334177) @@ -122,10 +122,8 @@ ${OUTPUTS}: ${CONF} ${CRUNCHGEN} -fq -m ${OUTMK} -c ${OUTC} ${CONF} # Avoid redundantly calling 'make objs' which we've done by our # own dependencies. - # Also avoid unneeded 'make depend' call. sed -i '' \ -e "s/^\(${PROG}:.*\) \$$(SUBMAKE_TARGETS)/\1/" \ - -e '/$$(CRUNCHMAKE) $$(BUILDOPTS).* \ &&.*/d' \ ${OUTMK} # These 2 targets cannot use .MAKE since they depend on the generated