OpenJDK / portola / portola
changeset 42298:8c12153445ae
8076577: Do not allow ccache prior to 3.2 on macosx
Reviewed-by: erikj
| author | ihse |
|---|---|
| date | Fri, 02 Dec 2016 15:57:02 +0100 |
| parents | ebbd32ba8997 |
| children | cc9f6e47e3bf |
| files | common/autoconf/build-performance.m4 common/autoconf/generated-configure.sh |
| diffstat | 2 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/build-performance.m4 Fri Dec 02 14:19:32 2016 +0100 +++ b/common/autoconf/build-performance.m4 Fri Dec 02 15:57:02 2016 +0100 @@ -217,6 +217,13 @@ AC_DEFUN([BPERF_SETUP_CCACHE_USAGE], [ if test "x$CCACHE" != x; then + if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then + HAS_BAD_CCACHE=[`$ECHO $CCACHE_VERSION | \ + $GREP -e '^1\.' -e '^2\.' -e '^3\.0\.' -e '^3\.1\.'`] + if test "x$HAS_BAD_CCACHE" != "x"; then + AC_MSG_ERROR([On macosx, ccache 3.2 or later is required, found $CCACHE_VERSION]) + fi + fi 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]$'`]
--- a/common/autoconf/generated-configure.sh Fri Dec 02 14:19:32 2016 +0100 +++ b/common/autoconf/generated-configure.sh Fri Dec 02 15:57:02 2016 +0100 @@ -5084,7 +5084,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1480684711 +DATE_WHEN_GENERATED=1480690601 ############################################################################### # @@ -65468,6 +65468,13 @@ if test "x$CCACHE" != x; then if test "x$CCACHE" != x; then + if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then + HAS_BAD_CCACHE=`$ECHO $CCACHE_VERSION | \ + $GREP -e '^1\.' -e '^2\.' -e '^3\.0\.' -e '^3\.1\.'` + if test "x$HAS_BAD_CCACHE" != "x"; then + as_fn_error $? "On macosx, ccache 3.2 or later is required, found $CCACHE_VERSION" "$LINENO" 5 + fi + fi 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]$'`