1.1 --- a/common/autoconf/toolchain.m4 Fri Jun 28 11:55:46 2013 +0200
1.2 +++ b/common/autoconf/toolchain.m4 Fri Jun 28 11:58:16 2013 +0200
1.3 @@ -47,7 +47,7 @@
1.4 elif test "x$OPENJDK_TARGET_OS" = xwindows; then
1.5 # First line typically looks something like:
1.6 # Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.30319.01 for 80x86
1.7 - COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1`
1.8 + COMPILER_VERSION_TEST=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'`
1.9 COMPILER_VERSION=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.*Version \(@<:@1-9@:>@@<:@0-9.@:>@*\) .*/\1/p"`
1.10 COMPILER_VENDOR="Microsoft CL.EXE"
1.11 COMPILER_CPU_TEST=`$ECHO $COMPILER_VERSION_TEST | $SED -n "s/^.* for \(.*\)$/\1/p"`
