OpenJDK / loom / loom
changeset 29175:2f9d8f167bd7
8074048: ccache 1.3.10 still not detected properly
Summary: Fix configure to detect ccache 1.3.10 properly
Reviewed-by: erikj
Contributed-by: steven.loomis@oracle.com
| author | srl |
|---|---|
| date | Wed, 04 Mar 2015 09:45:12 -0800 |
| parents | fe55607529c3 |
| children | 45baf3cdc876 |
| 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 Wed Mar 04 11:00:04 2015 +0100 +++ b/common/autoconf/build-performance.m4 Wed Mar 04 09:45:12 2015 -0800 @@ -215,7 +215,7 @@ if test "x$CCACHE" != x; then if test "x$USE_PRECOMPILED_HEADER" = "x1"; then HAS_BAD_CCACHE=[`$ECHO $CCACHE_VERSION | \ - $GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]'`] + $GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]$'`] if test "x$HAS_BAD_CCACHE" != "x"; then AC_MSG_ERROR([Precompiled headers requires ccache 3.1.4 or later, found $CCACHE_VERSION]) fi
--- a/common/autoconf/generated-configure.sh Wed Mar 04 11:00:04 2015 +0100 +++ b/common/autoconf/generated-configure.sh Wed Mar 04 09:45:12 2015 -0800 @@ -4348,7 +4348,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1425462435 +DATE_WHEN_GENERATED=1425490712 ############################################################################### # @@ -51519,7 +51519,7 @@ if test "x$CCACHE" != x; then if test "x$USE_PRECOMPILED_HEADER" = "x1"; then HAS_BAD_CCACHE=`$ECHO $CCACHE_VERSION | \ - $GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]'` + $GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]$'` if test "x$HAS_BAD_CCACHE" != "x"; then as_fn_error $? "Precompiled headers requires ccache 3.1.4 or later, found $CCACHE_VERSION" "$LINENO" 5 fi