summaryrefslogtreecommitdiffstats
path: root/Makefile.inc1
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2013-06-13 18:26:04 +0000
committerbrooks <brooks@FreeBSD.org>2013-06-13 18:26:04 +0000
commit30bbe141bf3a2d8a6776806bd2dd96a044ea2e10 (patch)
tree8f6c610b772b8cf4ce2584abe919a5aed395eab2 /Makefile.inc1
parentb69dcae913135f565960bb95e65b3f79cc9f1c5b (diff)
downloadFreeBSD-src-30bbe141bf3a2d8a6776806bd2dd96a044ea2e10.zip
FreeBSD-src-30bbe141bf3a2d8a6776806bd2dd96a044ea2e10.tar.gz
Be more agressive about bootstrapping ctfmerge and ctfconvert so
builds from existing releases have a chance of working properly. Sponsored by: DARPA, AFRL MFC after: 3 days
Diffstat (limited to 'Makefile.inc1')
-rw-r--r--Makefile.inc14
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index d65dd31..78f98e8 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1203,8 +1203,8 @@ _clang_tblgen= \
# dtrace tools are required for older bootstrap env and cross-build
.if ${MK_CDDL} != "no" && \
- ((${BOOTSTRAPPING} < 800038 && \
- !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)) \
+ ((${BOOTSTRAPPING} < 1000034 && \
+ !(${BOOTSTRAPPING} >= 901505 && ${BOOTSTRAPPING} < 999999)) \
|| (${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
OpenPOWER on IntegriCloud