common/autoconf/flags.m4

*** 766,776 ****
        * )
          $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer"
          $2CFLAGS_JDK="${$2CFLAGS_JDK} -fno-strict-aliasing"
          ;;
      esac
!     TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: 6, IF_AT_LEAST: FLAGS_SETUP_GCC6_COMPILER_FLAGS)
    elif test "x$TOOLCHAIN_TYPE" = xclang; then
      $2JVM_CFLAGS="[$]$2JVM_CFLAGS -D_GNU_SOURCE"
  
      # Restrict the debug information created by Clang to avoid
      # too big object files and speed the build up a little bit
--- 766,776 ----
        * )
          $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK -fno-omit-frame-pointer"
          $2CFLAGS_JDK="${$2CFLAGS_JDK} -fno-strict-aliasing"
          ;;
      esac
!     TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: 6, PREFIX: $2, IF_AT_LEAST: FLAGS_SETUP_GCC6_COMPILER_FLAGS)
    elif test "x$TOOLCHAIN_TYPE" = xclang; then
      $2JVM_CFLAGS="[$]$2JVM_CFLAGS -D_GNU_SOURCE"
  
      # Restrict the debug information created by Clang to avoid
      # too big object files and speed the build up a little bit
*** 962,972 ****
    if test "x$OPENJDK_$1_OS" = xlinux; then
      $2JVM_CFLAGS="[$]$2JVM_CFLAGS -Wpointer-arith -Wsign-compare -Wunused-function \
          -Wunused-value -Woverloaded-virtual"
  
      if test "x$TOOLCHAIN_TYPE" = xgcc; then
!       TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: [4.8],
            IF_AT_LEAST: [
              # These flags either do not work or give spurious warnings prior to gcc 4.8.
              $2JVM_CFLAGS="[$]$2JVM_CFLAGS -Wno-format-zero-length -Wtype-limits -Wuninitialized"
            ]
        )
--- 962,972 ----
    if test "x$OPENJDK_$1_OS" = xlinux; then
      $2JVM_CFLAGS="[$]$2JVM_CFLAGS -Wpointer-arith -Wsign-compare -Wunused-function \
          -Wunused-value -Woverloaded-virtual"
  
      if test "x$TOOLCHAIN_TYPE" = xgcc; then
!       TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: [4.8], PREFIX: $2,
            IF_AT_LEAST: [
              # These flags either do not work or give spurious warnings prior to gcc 4.8.
              $2JVM_CFLAGS="[$]$2JVM_CFLAGS -Wno-format-zero-length -Wtype-limits -Wuninitialized"
            ]
        )
*** 1409,1431 ****
          DISABLE_WARNING_PREFIX="-Wno-"
        else
          DISABLE_WARNING_PREFIX=
        fi
        CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
!       # Repeate the check for the BUILD_CC
        CC_OLD="$CC"
        CC="$BUILD_CC"
        FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [-Wno-this-is-a-warning-that-do-not-exist],
            IF_TRUE: [BUILD_CC_CAN_DISABLE_WARNINGS=true],
            IF_FALSE: [BUILD_CC_CAN_DISABLE_WARNINGS=false]
        )
        if test "x$BUILD_CC_CAN_DISABLE_WARNINGS" = "xtrue"; then
          BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
        else
          BUILD_CC_DISABLE_WARNING_PREFIX=
        fi
        CC="$CC_OLD"
        ;;
      clang)
        DISABLE_WARNING_PREFIX="-Wno-"
        CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
        ;;
--- 1409,1439 ----
          DISABLE_WARNING_PREFIX="-Wno-"
        else
          DISABLE_WARNING_PREFIX=
        fi
        CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
!       # Repeate the check for the BUILD_CC and BUILD_CXX. Need to also reset
!       # CFLAGS since any target specific flags will likely not work with the
!       # build compiler
        CC_OLD="$CC"
+       CXX_OLD="$CXX"
        CC="$BUILD_CC"
+       CXX="$BUILD_CXX"
+       CFLAGS_OLD="$CFLAGS"
+       CFLAGS=""
        FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [-Wno-this-is-a-warning-that-do-not-exist],
            IF_TRUE: [BUILD_CC_CAN_DISABLE_WARNINGS=true],
            IF_FALSE: [BUILD_CC_CAN_DISABLE_WARNINGS=false]
        )
        if test "x$BUILD_CC_CAN_DISABLE_WARNINGS" = "xtrue"; then
          BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
        else
          BUILD_CC_DISABLE_WARNING_PREFIX=
        fi
        CC="$CC_OLD"
+       CXX="$CXX_OLD"
+       CFLAGS="$CFLAGS_OLD"
        ;;
      clang)
        DISABLE_WARNING_PREFIX="-Wno-"
        CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
        ;;