Mercurial > hg > icedtea8-forest
changeset 1812:6517c9e186c5 icedtea-3.1.0pre04
PR2933: Support ccache 3.2 and later
Summary: Fix quoting of regular expression in m4 and send any error output to config.log
| author | andrew |
|---|---|
| date | Mon, 18 Jul 2016 04:38:24 +0100 |
| parents | 0971d0e09eef |
| children | 714df7334f0d |
| files | common/autoconf/build-performance.m4 common/autoconf/generated-configure.sh |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/build-performance.m4 Mon Jul 18 02:43:07 2016 +0100 +++ b/common/autoconf/build-performance.m4 Mon Jul 18 04:38:24 2016 +0100 @@ -199,7 +199,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 | grep -E "3\.(1\.[456789]|[2-9])") 2> /dev/null` + HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E "3\.(1\.@<:@456789@:>@|@<:@2-9@:>@)") 2>&AS_MESSAGE_LOG_FD` if test "x$HAS_GOOD_CCACHE" = x; then AC_MSG_RESULT([no, disabling ccache]) CCACHE=
--- a/common/autoconf/generated-configure.sh Mon Jul 18 02:43:07 2016 +0100 +++ b/common/autoconf/generated-configure.sh Mon Jul 18 04:38:24 2016 +0100 @@ -4014,7 +4014,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1468804174 +DATE_WHEN_GENERATED=1468812976 ############################################################################### # @@ -36395,7 +36395,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 | grep -E "3\.(1\.456789|2-9)") 2> /dev/null` + HAS_GOOD_CCACHE=`($CCACHE --version | head -n 1 | grep -E "3\.(1\.[456789]|[2-9])") 2>&5` if test "x$HAS_GOOD_CCACHE" = x; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling ccache" >&5 $as_echo "no, disabling ccache" >&6; }