summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.inc15
-rw-r--r--sys/sys/param.h2
-rw-r--r--tools/build/Makefile5
3 files changed, 11 insertions, 1 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index 877fa34..7099067 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -775,6 +775,10 @@ _groff= gnu/usr.bin/groff/tmac
_cap_mkdb= usr.bin/cap_mkdb
.endif
+.if ${BOOTSTRAPPING} < 600017
+_gencat= usr.bin/gencat
+.endif
+
.if ${BOOTSTRAPPING} < 600016
_mklocale= usr.bin/mklocale
.endif
@@ -792,6 +796,7 @@ bootstrap-tools:
gnu/usr.bin/texinfo \
${_cap_mkdb} \
usr.bin/colldef \
+ ${_gencat} \
usr.bin/lorder \
usr.bin/makewhatis \
${_mklocale} \
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 9117d8e..48f9d90 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -57,7 +57,7 @@
* is created, otherwise 1.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 600016 /* Master, propagated to newvers */
+#define __FreeBSD_version 600017 /* Master, propagated to newvers */
#ifndef LOCORE
#include <sys/types.h>
diff --git a/tools/build/Makefile b/tools/build/Makefile
index 5b76f09..be1de32 100644
--- a/tools/build/Makefile
+++ b/tools/build/Makefile
@@ -14,6 +14,11 @@ BOOTSTRAPPING?= 0
INCS+= runefile.h
.endif
+# usr.bin/gencat needs <nl_types.h>.
+.if ${BOOTSTRAPPING} < 600017
+INCS+= nl_types.h
+.endif
+
.if empty(SRCS)
SRCS= dummy.c
.endif
OpenPOWER on IntegriCloud