svn commit: r235500 - head

[Warner Losh]

Author: imp
Date: Wed May 16 04:21:21 2012
New Revision: 235500
URL: http://svn.freebsd.org/changeset/base/235500

Log:
  By request, add back support from 7.0 and newer, since the changes for
  that are so minimal.

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Wed May 16 01:59:09 2012	(r235499)
+++ head/Makefile.inc1	Wed May 16 04:21:21 2012	(r235500)
@@ -978,8 +978,8 @@ update:
 # legacy: Build compatibility shims for the next three targets
 #
 legacy:
-.if ${BOOTSTRAPPING} < 800107 && ${BOOTSTRAPPING} != 0
-	@echo "ERROR: Source upgrades from versions prior to 8.0 not supported."; \
+.if ${BOOTSTRAPPING} < 700055 && ${BOOTSTRAPPING} != 0
+	@echo "ERROR: Source upgrades from versions prior to 7.0 not supported."; \
 	false
 .endif
 .for _tool in tools/build
@@ -1007,6 +1007,10 @@ _gperf=		gnu/usr.bin/gperf
 _groff=		gnu/usr.bin/groff
 .endif
 
+.if ${BOOTSTRAPPING} < 800013
+_mklocale=	usr.bin/mklocale
+.endif
+
 .if ${BOOTSTRAPPING} < 900002
 _sed=		usr.bin/sed
 .endif
@@ -1020,7 +1024,7 @@ _yacc=		usr.bin/yacc
 _awk=		usr.bin/awk
 .endif
 
-.if ${MK_BSNMP} != "no" &&  !exists(/usr/sbin/gensnmptree)
+.if ${MK_BSNMP} != "no" && !exists(/usr/sbin/gensnmptree)
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
 
@@ -1034,7 +1038,9 @@ _clang_tblgen= \
 
 # dtrace tools are required for older bootstrap env and cross-build
 .if ${MK_CDDL} != "no" && \
-    (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH})
+    ((${BOOTSTRAPPING} < 800038 && \
+          !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)) \
+      || (${MACHINE} != ${TARGET} || ${MACHINE_ARCH} != ${TARGET_ARCH}))
 _dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
     lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
 .endif
@@ -1067,6 +1073,7 @@ bootstrap-tools:
     ${_awk} \
     usr.bin/lorder \
     usr.bin/makewhatis \
+    ${_mklocale} \
     usr.bin/rpcgen \
     ${_sed} \
     ${_lex} \
@@ -1132,7 +1139,7 @@ build-tools:
 #
 # cross-tools: Build cross-building tools
 #
-.if ${TARGET_ARCH} != ${MACHINE_ARCH}
+.if ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 800035
 .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386"
 _btxld=		usr.sbin/btxld
 .endif