. Unreak CCACHE

PR:		205751
Submitted by:	chris@chrullrich.net
This commit is contained in:
Greg Lewis 2016-01-21 05:25:44 +00:00
parent 0111c1be99
commit 24e7dd6d89
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=406824
2 changed files with 22 additions and 0 deletions

View file

@ -0,0 +1,11 @@
--- common/autoconf/build-performance.m4 Sat Oct 24 06:20:56 2015 -0700
+++ common/autoconf/build-performance.m4 Wed Jan 20 21:11:23 2016 -0800
@@ -212,7 +212,7 @@
# Only use ccache if it is 3.1.4 or later, which supports
# precompiled headers.
AC_MSG_CHECKING([if ccache supports precompiled headers])
- HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split($3, a, "."); if (a@<:@1@:>@ >= 3 && (a@<:@2@:>@ > 1 || (a@<:@2@:>@ == 1 && a@<:@3@:>@ >= 4))) print "yes"; else print "no"; }') 2> /dev/null`
+ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split(@S|@3, a, "."); if (a@<:@1@:>@ >= 3 && (a@<:@2@:>@ > 1 || (a@<:@2@:>@ == 1 && a@<:@3@:>@ >= 4))) print "yes"; else print "no"; }') 2> /dev/null`
if test "x$HAS_GOOD_CCACHE" = xyes; then
AC_MSG_RESULT([no, disabling ccache])
CCACHE=

View file

@ -0,0 +1,11 @@
--- common/autoconf/generated-configure.sh Sat Oct 24 06:20:56 2015 -0700
+++ common/autoconf/generated-configure.sh Wed Jan 20 21:11:45 2016 -0800
@@ -36324,7 +36324,7 @@
# precompiled headers.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ccache supports precompiled headers" >&5
$as_echo_n "checking if ccache supports precompiled headers... " >&6; }
- HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split(, a, "."); if (a[1] >= 3 && (a[2] > 1 || (a[2] == 1 && a[3] >= 4))) print "yes"; else print "no"; }') 2> /dev/null`
+ HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | awk '{ split($3, a, "."); if (a[1] >= 3 && (a[2] > 1 || (a[2] == 1 && a[3] >= 4))) print "yes"; else print "no"; }') 2> /dev/null`
if test "x$HAS_GOOD_CCACHE" = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5
$as_echo "no, disabling ccache" >&6; }