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

rescue: Restore 'make depend' call to fix WITH_META_MODE after r334008.

Browse Source 
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
This commit is contained in:
Bryan Drewery 2018-05-24 18:49:19 +00:00
parent 2357535254
commit bbec13875a
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/mk/bsd.crunchgen.mk
View File

@ -122,10 +122,8 @@ ${OUTPUTS}: ${CONF}
${CRUNCHGEN} -fq -m ${OUTMK} -c ${OUTC} ${CONF} ${CRUNCHGEN} -fq -m ${OUTMK} -c ${OUTC} ${CONF}
# Avoid redundantly calling 'make objs' which we've done by our # Avoid redundantly calling 'make objs' which we've done by our
# own dependencies. # own dependencies.
# Also avoid unneeded 'make depend' call.
sed -i '' \ sed -i '' \
-e "s/^\(${PROG}:.*\) \$$(SUBMAKE_TARGETS)/\1/" \ -e "s/^\(${PROG}:.*\) \$$(SUBMAKE_TARGETS)/\1/" \
-e '/$$(CRUNCHMAKE) $$(BUILDOPTS).* \<depend\> &&.*/d' \
${OUTMK} ${OUTMK}
# These 2 targets cannot use .MAKE since they depend on the generated # These 2 targets cannot use .MAKE since they depend on the generated