1.1 --- a/common/autoconf/toolchain.m4 Wed Sep 12 17:28:01 2018 +0100
1.2 +++ b/common/autoconf/toolchain.m4 Wed Sep 12 16:13:34 2018 +0100
1.3 @@ -56,21 +56,21 @@
1.4 # $2 - optional variable prefix for comparable variable (OPENJDK_BUILD_)
1.5 AC_DEFUN([TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS],
1.6 [
1.7 - if test "x$CC_VERSION" != "x$CXX_VERSION"; then
1.8 - AC_MSG_WARN([C and C++ compiler has different version numbers, $CC_VERSION vs $CXX_VERSION.])
1.9 + if test "x$CC_VERSION_NUMBER" != "x$CXX_VERSION_NUMBER"; then
1.10 + AC_MSG_WARN([C and C++ compiler has different version numbers, $CC_VERSION_NUMBER vs $CXX_VERSION_NUMBER.])
1.11 AC_MSG_WARN([This typically indicates a broken setup, and is not supported])
1.12 fi
1.13
1.14 - # We only check CC_VERSION since we assume CXX_VERSION is equal.
1.15 - if [ [[ "$CC_VERSION" =~ (.*\.){3} ]] ]; then
1.16 + # We only check CC_VERSION_NUMBER since we assume CXX_VERSION_NUMBER is equal.
1.17 + if [ [[ "$CC_VERSION_NUMBER" =~ (.*\.){3} ]] ]; then
1.18 AC_MSG_WARN([C compiler version number has more than three parts (X.Y.Z): $CC_VERSION. Comparisons might be wrong.])
1.19 fi
1.20
1.21 - if [ [[ "$CC_VERSION" =~ [0-9]{6} ]] ]; then
1.22 + if [ [[ "$CC_VERSION_NUMBER" =~ [0-9]{6} ]] ]; then
1.23 AC_MSG_WARN([C compiler version number has a part larger than 99999: $CC_VERSION. Comparisons might be wrong.])
1.24 fi
1.25
1.26 - $2COMPARABLE_ACTUAL_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", [$]1, [$]2, [$]3) }' <<< "$CC_VERSION"`
1.27 + $2COMPARABLE_ACTUAL_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", [$]1, [$]2, [$]3) }' <<< "$CC_VERSION_NUMBER"`
1.28 ])
1.29
1.30 # Check if the configured compiler (C and C++) is of a specific version or
