D26455.id77108.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D26455.id77108.diff
View Options

	Index: Makefile.inc1
	===================================================================
	--- Makefile.inc1
	+++ Makefile.inc1
	@@ -2211,12 +2211,8 @@
	_bootstrap_tools_links+=crunchide
	.endif

	-# r285986 crunchen: use STRIPBIN rather than STRIP
	-# 1100113: Support MK_AUTO_OBJ
	-# 1200006: META_MODE fixes
	-.if ${BOOTSTRAPPING} < 1100078 \|\| \
	- (${MK_AUTO_OBJ} == "yes" && ${BOOTSTRAPPING} < 1100114) \|\| \
	- (${MK_META_MODE} == "yes" && ${BOOTSTRAPPING} < 1200006)
	+# 1300115: Higher WARNS fixes
	+.if ${BOOTSTRAPPING} < 1300115
	_crunchgen= usr.sbin/crunch/crunchgen
	.else
	_bootstrap_tools_links+=crunchgen
	Index: tools/build/depend-cleanup.sh
	===================================================================
	--- tools/build/depend-cleanup.sh
	+++ tools/build/depend-cleanup.sh
	@@ -49,3 +49,10 @@
	echo "Removing old ZFS tree"
	rm -rf "$OBJTOP"/cddl "$OBJTOP"/obj-lib32/cddl
	fi
	+
	+# 20200916 rXXXXXX WARNS bumped, need bootstrapped crunchgen stubs
	+if [ -e "$OBJTOP"/rescue/rescue/rescue.c ] && \
	+ ! grep -q 'crunched_stub_t' "$OBJTOP"/rescue/rescue/rescue.c; then
	+ echo "Removing old rescue(8) tree"
	+ rm -rf "$OBJTOP"/rescue/rescue
	+fi