aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.inc14
-rw-r--r--sys/sys/param.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index d87a6dbdb963..29ec4262251f 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1628,8 +1628,10 @@ _crunchide= usr.sbin/crunch/crunchide
# 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_AUTO_OBJ} == "yes" && ${BOOTSTRAPPING} < 1100114) || \
+ (${MK_META_MODE} == "yes" && ${BOOTSTRAPPING} < 1200006)
_crunchgen= usr.sbin/crunch/crunchgen
.endif
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 1f70de4f9859..b7c5878bbf8d 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1200005 /* Master, propagated to newvers */
+#define __FreeBSD_version 1200006 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,