svn commit: r311186 - in stable/11: . sys/sys

[Bryan Drewery]

Author: bdrewery
Date: Tue Jan  3 22:57:09 2017
New Revision: 311186
URL: https://svnweb.freebsd.org/changeset/base/311186

Log:
  MFC r305256:
  
    Bump __FreeBSD_version for crunchgen META_MODE fix in r311185.

Modified:
  stable/11/Makefile.inc1
  stable/11/sys/sys/param.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/Makefile.inc1
==============================================================================
--- stable/11/Makefile.inc1	Tue Jan  3 22:55:10 2017	(r311185)
+++ stable/11/Makefile.inc1	Tue Jan  3 22:57:09 2017	(r311186)
@@ -1612,8 +1612,10 @@ _crunchide=	usr.sbin/crunch/crunchide
 
 # r285986 crunchen: use STRIPBIN rather than STRIP
 # 1100113: Support MK_AUTO_OBJ
+# 1100509: 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
 

Modified: stable/11/sys/sys/param.h
==============================================================================
--- stable/11/sys/sys/param.h	Tue Jan  3 22:55:10 2017	(r311185)
+++ stable/11/sys/sys/param.h	Tue Jan  3 22:57:09 2017	(r311186)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1100508	/* Master, propagated to newvers */
+#define __FreeBSD_version 1100509	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,