Author: bdrewery
Date: Tue Jan 3 22:55:10 2017
New Revision: 311185
URL: https://svnweb.freebsd.org/changeset/base/311185
Log:
MFC r305254:
META_MODE/DIRDEPS_BUILD: Fix various issues with crunch builds.
Modified:
stable/11/share/mk/bsd.crunchgen.mk
stable/11/usr.sbin/crunch/crunchgen/crunchgen.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/share/mk/bsd.crunchgen.mk
==============================================================================
--- stable/11/share/mk/bsd.crunchgen.mk Tue Jan 3 22:52:24 2017
(r311184)
+++ stable/11/share/mk/bsd.crunchgen.mk Tue Jan 3 22:55:10 2017
(r311185)
@@ -123,11 +123,13 @@ ${OUTPUTS}: ${CONF}
# These 2 targets cannot use .MAKE since they depend on the generated
# ${OUTMK} above.
-${PROG}: ${OUTPUTS} objs .META
+${PROG}: ${OUTPUTS} objs .NOMETA .PHONY
${CRUNCHENV} \
CC="${CC} ${CFLAGS} ${LDFLAGS}" \
CXX="${CXX} ${CXXFLAGS} ${LDFLAGS}" \
- ${MAKE} .MAKE.MODE=normal -f ${OUTMK} exe
+ ${MAKE} .MAKE.MODE="${.MAKE.MODE} curdirOk=yes" \
+ .MAKE.META.IGNORE_PATHS="${.MAKE.META.IGNORE_PATHS}" \
+ -f ${OUTMK} exe
objs: ${OUTMK} .META
${CRUNCHENV} MAKEOBJDIRPREFIX=${CRUNCHOBJS} \
@@ -167,3 +169,4 @@ clean:
fi
META_XTRAS+= ${find ${CRUNCHOBJS}${SRCTOP} -name '*.meta' 2>/dev/null ||
true:L:sh}
+META_XTRAS+= ${PROG}.meta
Modified: stable/11/usr.sbin/crunch/crunchgen/crunchgen.c
==============================================================================
--- stable/11/usr.sbin/crunch/crunchgen/crunchgen.c Tue Jan 3 22:52:24
2017 (r311184)
+++ stable/11/usr.sbin/crunch/crunchgen/crunchgen.c Tue Jan 3 22:55:10
2017 (r311185)
@@ -1064,6 +1064,7 @@ prog_makefile_rules(FILE *outmk, prog_t
}
fprintf(outmk, "\n");
}
+ fprintf(outmk, "$(%s_OBJPATHS): .NOMETA\n", p->ident);
if (p->srcdir && p->objs) {
fprintf(outmk, "%s_SRCDIR=%s\n", p->ident, p->srcdir);
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
