diff options
| author | imp <imp@FreeBSD.org> | 2012-05-16 04:21:21 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2012-05-16 04:21:21 +0000 |
| commit | 5eb63ec7dd1e2a7728305682d0c7339f0754298c (patch) | |
| tree | 940a12f4ac5eafdb05d73951b4461033cf5e4cf5 /Makefile.inc1 | |
| parent | 2ad549ab3d4e6d6f0b1df179437865160f0be1fb (diff) | |
| download | FreeBSD-src-5eb63ec7dd1e2a7728305682d0c7339f0754298c.zip FreeBSD-src-5eb63ec7dd1e2a7728305682d0c7339f0754298c.tar.gz | |
By request, add back support from 7.0 and newer, since the changes for
that are so minimal.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index f359d30..52a9174 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 |
