From bbec13875a96f37320e77c58a0dc0ce1a7df2bcc Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Thu, 24 May 2018 18:49:19 +0000 Subject: [PATCH] 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 --- share/mk/bsd.crunchgen.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/share/mk/bsd.crunchgen.mk b/share/mk/bsd.crunchgen.mk index 1e60d81fffd4..6d775ce9af05 100644 --- a/share/mk/bsd.crunchgen.mk +++ b/share/mk/bsd.crunchgen.mk @@ -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