OpenJDK / amber / amber
changeset 44025:34389f09ea47
8176033: New cygwin grep does not match \r as newline
Reviewed-by: tbell, ihse
| author | erikj |
|---|---|
| date | Wed, 01 Mar 2017 21:28:39 +0100 |
| parents | f97a7c02d349 |
| children | a46c32199211 |
| files | common/autoconf/basics_windows.m4 common/autoconf/generated-configure.sh |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/basics_windows.m4 Fri Feb 24 12:01:32 2017 +0100 +++ b/common/autoconf/basics_windows.m4 Wed Mar 01 21:28:39 2017 +0100 @@ -329,8 +329,8 @@ AC_MSG_ERROR([Something is wrong with your cygwin installation since I cannot find cygpath.exe in your path]) fi AC_MSG_CHECKING([cygwin root directory as unix-style path]) - # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away - cygwin_winpath_root=`cd / ; cmd /c cd | $GREP ".*"` + # The cmd output ends with Windows line endings (CR/LF) + cygwin_winpath_root=`cd / ; cmd /c cd | $TR -d '\r\n'` # Force cygpath to report the proper root by including a trailing space, and then stripping it off again. CYGWIN_ROOT_PATH=`$CYGPATH -u "$cygwin_winpath_root " | $CUT -f 1 -d " "` AC_MSG_RESULT([$CYGWIN_ROOT_PATH])
--- a/common/autoconf/generated-configure.sh Fri Feb 24 12:01:32 2017 +0100 +++ b/common/autoconf/generated-configure.sh Wed Mar 01 21:28:39 2017 +0100 @@ -5170,7 +5170,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1487934085 +DATE_WHEN_GENERATED=1488400074 ############################################################################### # @@ -16200,8 +16200,8 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking cygwin root directory as unix-style path" >&5 $as_echo_n "checking cygwin root directory as unix-style path... " >&6; } - # The cmd output ends with Windows line endings (CR/LF), the grep command will strip that away - cygwin_winpath_root=`cd / ; cmd /c cd | $GREP ".*"` + # The cmd output ends with Windows line endings (CR/LF) + cygwin_winpath_root=`cd / ; cmd /c cd | $TR -d '\r\n'` # Force cygpath to report the proper root by including a trailing space, and then stripping it off again. CYGWIN_ROOT_PATH=`$CYGPATH -u "$cygwin_winpath_root " | $CUT -f 1 -d " "` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGWIN_ROOT_PATH" >&5