make/autoconf/toolchain.m4

*** 425,435 ****
    elif test  "x$TOOLCHAIN_TYPE" = xmicrosoft; then
      # There is no specific version flag, but all output starts with a version string.
      # First line typically looks something like:
      # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
      # but the compiler name may vary depending on locale.
!     COMPILER_VERSION_OUTPUT=`"$COMPILER" 2>&1 | $GREP -v 'ERROR.*UtilTranslatePathList' | $HEAD -n 1 | $TR -d '\r'`
      # Check that this is likely to be Microsoft CL.EXE.
      $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Microsoft" > /dev/null
      if test $? -ne 0; then
        AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
        AC_MSG_NOTICE([The result from running it was: "$COMPILER_VERSION_OUTPUT"])
--- 425,435 ----
    elif test  "x$TOOLCHAIN_TYPE" = xmicrosoft; then
      # There is no specific version flag, but all output starts with a version string.
      # First line typically looks something like:
      # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86
      # but the compiler name may vary depending on locale.
!     COMPILER_VERSION_OUTPUT=`"$COMPILER" 2>&1 | $GREP 'Optimizing Compiler' | $HEAD -n 1 | $TR -d '\r'`
      # Check that this is likely to be Microsoft CL.EXE.
      $ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Microsoft" > /dev/null
      if test $? -ne 0; then
        AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.])
        AC_MSG_NOTICE([The result from running it was: "$COMPILER_VERSION_OUTPUT"])
*** 957,967 ****
  AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
  [
    # Check for extra potential brokenness.
    if test  "x$TOOLCHAIN_TYPE" = xmicrosoft; then
      # On Windows, double-check that we got the right compiler.
!     CC_VERSION_OUTPUT=`$CC 2>&1 | $GREP -v 'ERROR.*UtilTranslatePathList' | $HEAD -n 1 | $TR -d '\r'`
      COMPILER_CPU_TEST=`$ECHO $CC_VERSION_OUTPUT | $SED -n "s/^.* \(.*\)$/\1/p"`
      if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
        if test "x$COMPILER_CPU_TEST" != "x80x86" -a "x$COMPILER_CPU_TEST" != "xx86"; then
          AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "80x86" or "x86".])
        fi
--- 957,967 ----
  AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
  [
    # Check for extra potential brokenness.
    if test  "x$TOOLCHAIN_TYPE" = xmicrosoft; then
      # On Windows, double-check that we got the right compiler.
!     CC_VERSION_OUTPUT=`$CC 2>&1 | $GREP 'Optimizing Compiler' | $HEAD -n 1 | $TR -d '\r'`
      COMPILER_CPU_TEST=`$ECHO $CC_VERSION_OUTPUT | $SED -n "s/^.* \(.*\)$/\1/p"`
      if test "x$OPENJDK_TARGET_CPU" = "xx86"; then
        if test "x$COMPILER_CPU_TEST" != "x80x86" -a "x$COMPILER_CPU_TEST" != "xx86"; then
          AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "80x86" or "x86".])
        fi