diff options
| author | imp <imp@FreeBSD.org> | 2014-05-23 00:20:48 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2014-05-23 00:20:48 +0000 |
| commit | b7502fd352634095fd663465937f566f7e9cb202 (patch) | |
| tree | 8bab443c4caa5f48fe76175862c19b06c2882888 /Makefile.inc1 | |
| parent | e7c2a7877e0e0edc51335e977bd23f4c9dba7d16 (diff) | |
| download | FreeBSD-src-b7502fd352634095fd663465937f566f7e9cb202.zip FreeBSD-src-b7502fd352634095fd663465937f566f7e9cb202.tar.gz | |
When libelf and libdwarf were updated, we didn't bump the minimal
version needed for CTF tools, so sometimes we'd use the host's CTF
tools that didn't work. Be sure to bootstrap in that case.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 8f1ee1a..09c188b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1238,9 +1238,8 @@ _clang_tblgen= \ .endif # dtrace tools are required for older bootstrap env and cross-build -.if ${MK_CDDL} != "no" && \ - ((${BOOTSTRAPPING} < 1000034 && \ - !(${BOOTSTRAPPING} >= 901505 && ${BOOTSTRAPPING} < 999999)) \ +# pre libdwarf +.if ${MK_CDDL} != "no" && (${BOOTSTRAPPING} < 1100006 \ || (${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 |
