Mercurial > hg > openjdk > jdk8u
changeset 2526:54c2268dd734 jdk8u292-b04
8236500: Windows ucrt.dll should be looked up in versioned WINSDK subdirectory
Reviewed-by: mdoerr, andrew
author | clanger |
---|---|
date | Thu, 18 Feb 2021 14:12:05 +0300 |
parents | c07f18c5f490 |
children | 120809c21ad7 |
files | common/autoconf/generated-configure.sh common/autoconf/toolchain_windows.m4 |
diffstat | 2 files changed, 23 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Tue Feb 16 02:15:53 2021 +0000 +++ b/common/autoconf/generated-configure.sh Thu Feb 18 14:12:05 2021 +0300 @@ -4394,7 +4394,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1606462098 +DATE_WHEN_GENERATED=1613496357 ############################################################################### # @@ -51942,9 +51942,18 @@ fi UCRT_DLL_DIR="$CYGWIN_WINDOWSSDKDIR/Redist/ucrt/DLLs/$dll_subdir" if test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error $? "Could not find any dlls in $UCRT_DLL_DIR" "$LINENO" 5 + # Try with version subdir + UCRT_DLL_DIR="`ls -d $CYGWIN_WINDOWSSDKDIR/Redist/*/ucrt/DLLs/$dll_subdir \ + 2> /dev/null | $SORT -d | $HEAD -n1`" + if test -z "$UCRT_DLL_DIR" \ + || test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + as_fn_error $? "Could not find any dlls in $UCRT_DLL_DIR" "$LINENO" 5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UCRT_DLL_DIR" >&5 +$as_echo "$UCRT_DLL_DIR" >&6; } + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UCRT_DLL_DIR" >&5 $as_echo "$UCRT_DLL_DIR" >&6; }
--- a/common/autoconf/toolchain_windows.m4 Tue Feb 16 02:15:53 2021 +0000 +++ b/common/autoconf/toolchain_windows.m4 Thu Feb 18 14:12:05 2021 +0300 @@ -672,8 +672,16 @@ fi UCRT_DLL_DIR="$CYGWIN_WINDOWSSDKDIR/Redist/ucrt/DLLs/$dll_subdir" if test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([Could not find any dlls in $UCRT_DLL_DIR]) + # Try with version subdir + UCRT_DLL_DIR="`ls -d $CYGWIN_WINDOWSSDKDIR/Redist/*/ucrt/DLLs/$dll_subdir \ + 2> /dev/null | $SORT -d | $HEAD -n1`" + if test -z "$UCRT_DLL_DIR" \ + || test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then + AC_MSG_RESULT([no]) + AC_MSG_ERROR([Could not find any dlls in $UCRT_DLL_DIR]) + else + AC_MSG_RESULT($UCRT_DLL_DIR) + fi else AC_MSG_RESULT($UCRT_DLL_DIR) fi