# HG changeset patch
# User erikj
# Date 1372413496 -7200
# Node ID 5f706ddb73ed68a56b6fa0c4723d1b65bd5f636b
# Parent  8443ba629f9daff4f4e6c9bc7e1d7b2bb7a98c46
8019229: Build Configuration Fail in Windows Platform
Reviewed-by: chegar, tbell, dxu

diff -r 8443ba629f9d -r 5f706ddb73ed common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Fri Jun 28 11:55:46 2013 +0200
+++ b/common/autoconf/generated-configure.sh	Fri Jun 28 11:58:16 2013 +0200
@@ -3785,7 +3785,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1372317997
+DATE_WHEN_GENERATED=1372413413
 
 ###############################################################################
 #
@@ -20133,7 +20133,7 @@
   elif test  "x$OPENJDK_TARGET_OS" = xwindows; then
     # First line typically looks something like:
     # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
-    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1`
+    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
     COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
     COMPILER_VENDOR="Microsoft CL.EXE"
     COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
@@ -21706,7 +21706,7 @@
   elif test  "x$OPENJDK_TARGET_OS" = xwindows; then
     # First line typically looks something like:
     # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
-    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1`
+    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
     COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \([1-9][0-9.]*\) .*/\1/p"`
     COMPILER_VENDOR="Microsoft CL.EXE"
     COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
diff -r 8443ba629f9d -r 5f706ddb73ed common/autoconf/toolchain.m4
--- a/common/autoconf/toolchain.m4	Fri Jun 28 11:55:46 2013 +0200
+++ b/common/autoconf/toolchain.m4	Fri Jun 28 11:58:16 2013 +0200
@@ -47,7 +47,7 @@
   elif test  "x$OPENJDK_TARGET_OS" = xwindows; then
     # First line typically looks something like:
     # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
-    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1`
+    COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
     COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \(@<:@1-9@:>@@<:@0-9.@:>@*\) .*/\1/p"`
     COMPILER_VENDOR="Microsoft CL.EXE"
     COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`