Date: Mon, 17 Jun 2013 19:54:48 +0000 (UTC) From: Brooks Davis <brooks@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r251861 - stable/9 Message-ID: <201306171954.r5HJsmnR018560@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brooks Date: Mon Jun 17 19:54:47 2013 New Revision: 251861 URL: http://svnweb.freebsd.org/changeset/base/251861 Log: MFC r251689 Be more agressive about bootstrapping ctfmerge and ctfconvert so builds from existing releases have a chance of working properly when WITH_CLANG_IS_CC is enabled. Modified: stable/9/Makefile.inc1 (contents, props changed) Modified: stable/9/Makefile.inc1 ============================================================================== --- stable/9/Makefile.inc1 Mon Jun 17 19:45:27 2013 (r251860) +++ stable/9/Makefile.inc1 Mon Jun 17 19:54:47 2013 (r251861) @@ -1166,8 +1166,9 @@ _clang_tblgen= \ .endif .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 .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306171954.r5HJsmnR018560>