Mercurial Mercurial > jdk-sandbox / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make/autoconf/toolchain_windows.m4
changeset 53110 50677f43ac3d
parent 52804 28094715ae71
child 53240 f6ab4cc4c70e
equal deleted inserted replaced
53109:b99b41325d89 53110:50677f43ac3d 
   113       AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD])
 
   113       AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD])
 
   114       if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
 
   114       if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
 
   115         VCVARSFILES="vc/bin/vcvars32.bat vc/auxiliary/build/vcvars32.bat"
 
   115         VCVARSFILES="vc/bin/vcvars32.bat vc/auxiliary/build/vcvars32.bat"
 
   116       else
 
   116       else
 
   117         VCVARSFILES="vc/bin/amd64/vcvars64.bat vc/bin/x86_amd64/vcvarsx86_amd64.bat \
 
   117         VCVARSFILES="vc/bin/amd64/vcvars64.bat vc/bin/x86_amd64/vcvarsx86_amd64.bat \
 
   118             vc/auxiliary/build/vcvarsx86_amd64.bat vc/auxiliary/build/vcvars64.bat"
 
   118             VC/Auxiliary/Build/vcvarsx86_amd64.bat VC/Auxiliary/Build/vcvars64.bat"
 
   119       fi
 
   119       fi
 
   120 
   120 
   121       for VCVARSFILE in $VCVARSFILES; do
 
   121       for VCVARSFILE in $VCVARSFILES; do
 
   122         if test -f "$VS_BASE/$VCVARSFILE"; then
 
   122         if test -f "$VS_BASE/$VCVARSFILE"; then
 
   123           VS_ENV_CMD="$VS_BASE/$VCVARSFILE"
 
   123           VS_ENV_CMD="$VS_BASE/$VCVARSFILE"
 
   220   fi
 
   220   fi
 
   221   TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}],
 
   221   TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}],
 
   222       [C:/Program Files/$VS_INSTALL_DIR], [well-known name])
 
   222       [C:/Program Files/$VS_INSTALL_DIR], [well-known name])
 
   223   TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}],
 
   223   TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}],
 
   224       [C:/Program Files (x86)/$VS_INSTALL_DIR], [well-known name])
 
   224       [C:/Program Files (x86)/$VS_INSTALL_DIR], [well-known name])
 
   225 
       
   226   if test "x$SDK_INSTALL_DIR" != x; then
 
   225   if test "x$SDK_INSTALL_DIR" != x; then
 
   227     if test "x$ProgramW6432" != x; then
 
   226     if test "x$ProgramW6432" != x; then
 
   228       TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([${VS_VERSION}],
 
   227       TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([${VS_VERSION}],
 
   229           [$ProgramW6432/$SDK_INSTALL_DIR], [well-known name])
 
   228           [$ProgramW6432/$SDK_INSTALL_DIR], [well-known name])
 
   230     fi
 
   229     fi
 
   337 # the set env variables into the spec file.
 
   336 # the set env variables into the spec file.
 
   338 AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
 
   337 AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV],
 
   339 [
 
   338 [
 
   340   # Store path to cygwin link.exe to help excluding it when searching for
 
   339   # Store path to cygwin link.exe to help excluding it when searching for
 
   341   # VS linker. This must be done before changing the PATH when looking for VS.
 
   340   # VS linker. This must be done before changing the PATH when looking for VS.
 
   342   AC_PATH_PROG(CYGWIN_LINK, link)
 
   341   AC_PATH_PROG(CYGWIN_LINK, link.exe)
 
   343   if test "x$CYGWIN_LINK" != x; then
 
   342   if test "x$CYGWIN_LINK" != x; then
 
   344     AC_MSG_CHECKING([if the first found link.exe is actually the Cygwin link tool])
 
   343     AC_MSG_CHECKING([if the first found link.exe is actually the Cygwin link tool])
 
   345     "$CYGWIN_LINK" --version > /dev/null
 
   344     "$CYGWIN_LINK" --version > /dev/null
 
   346     if test $? -eq 0 ; then
 
   345     if test $? -eq 0 ; then
 
   347       AC_MSG_RESULT([yes])
 
   346       AC_MSG_RESULT([yes])
 
   370 
   369 
   371       # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment).
 
   370       # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment).
 
   372       # Instead create a shell script which will set the relevant variables when run.
 
   371       # Instead create a shell script which will set the relevant variables when run.
 
   373       WINPATH_VS_ENV_CMD="$VS_ENV_CMD"
 
   372       WINPATH_VS_ENV_CMD="$VS_ENV_CMD"
 
   374       BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([WINPATH_VS_ENV_CMD])
 
   373       BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([WINPATH_VS_ENV_CMD])
 
   375       WINPATH_BASH="$BASH"
 
   374 
   376       BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([WINPATH_BASH])
 
   375       if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
 
       
   376         WINPATH_BASH="bash"
 
       
   377       else
 
       
   378         WINPATH_BASH="$BASH"
 
       
   379         BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([WINPATH_BASH])
 
       
   380       fi
 
   377 
   381 
   378       # Generate a DOS batch file which runs $VS_ENV_CMD, and then creates a shell
 
   382       # Generate a DOS batch file which runs $VS_ENV_CMD, and then creates a shell
 
   379       # script (executable by bash) that will setup the important variables.
 
   383       # script (executable by bash) that will setup the important variables.
 
   380       EXTRACT_VC_ENV_BAT_FILE="$VS_ENV_TMP_DIR/extract-vs-env.bat"
 
   384       EXTRACT_VC_ENV_BAT_FILE="$VS_ENV_TMP_DIR/extract-vs-env.bat"
 
   381       $ECHO "@echo off" >  $EXTRACT_VC_ENV_BAT_FILE
 
   385       $ECHO "@echo off" >  $EXTRACT_VC_ENV_BAT_FILE
 
   382       # This will end up something like:
 
   386       # This will end up something like:
 
   383       # call C:/progra~2/micros~2.0/vc/bin/amd64/vcvars64.bat
 
   387       # call C:/progra~2/micros~2.0/vc/bin/amd64/vcvars64.bat
 
   384       $ECHO "call $WINPATH_VS_ENV_CMD $VS_ENV_ARGS" >> $EXTRACT_VC_ENV_BAT_FILE
 
   388       $ECHO "call \"$WINPATH_VS_ENV_CMD\" $VS_ENV_ARGS" >> $EXTRACT_VC_ENV_BAT_FILE
 
   385       # In some cases, the VS_ENV_CMD will change directory, change back so
 
   389       # In some cases, the VS_ENV_CMD will change directory, change back so
 
   386       # the set-vs-env.sh ends up in the right place.
 
   390       # the set-vs-env.sh ends up in the right place.
 
   387       $ECHO 'cd %~dp0' >> $EXTRACT_VC_ENV_BAT_FILE
 
   391       $ECHO 'cd %~dp0' >> $EXTRACT_VC_ENV_BAT_FILE
 
   388       # These will end up something like:
 
   392       if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
 
   389       # C:/CygWin/bin/bash -c 'echo VS_PATH=\"$PATH\" > localdevenv.sh
 
   393         # These will end up something like:
 
   390       # The trailing space for everyone except PATH is no typo, but is needed due
 
   394         # echo VS_PATH=\"$PATH\" > set-vs-env.sh
 
   391       # to trailing \ in the Windows paths. These will be stripped later.
 
   395         # The trailing space for everyone except PATH is no typo, but is needed due
 
   392       $ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' \
 
   396         # to trailing \ in the Windows paths. These will be stripped later.
 
   393           >> $EXTRACT_VC_ENV_BAT_FILE
 
   397         # Trying pure CMD extract. This results in windows paths that need to
 
   394       $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE\;$include \" >> set-vs-env.sh' \
 
   398         # be converted post extraction, but a simpler script.
 
   395           >> $EXTRACT_VC_ENV_BAT_FILE
 
   399         $ECHO 'echo VS_PATH="%PATH%" > set-vs-env.sh' \
 
   396       $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB\;$lib \" >> set-vs-env.sh' \
 
   400             >> $EXTRACT_VC_ENV_BAT_FILE
 
   397           >> $EXTRACT_VC_ENV_BAT_FILE
 
   401         $ECHO 'echo VS_INCLUDE="%INCLUDE% " >> set-vs-env.sh' \
 
   398       $ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' \
 
   402             >> $EXTRACT_VC_ENV_BAT_FILE
 
   399           >> $EXTRACT_VC_ENV_BAT_FILE
 
   403         $ECHO 'echo VS_LIB="%LIB% " >> set-vs-env.sh' \
 
   400       $ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' \
 
   404             >> $EXTRACT_VC_ENV_BAT_FILE
 
   401           >> $EXTRACT_VC_ENV_BAT_FILE
 
   405         $ECHO 'echo VCINSTALLDIR="%VCINSTALLDIR% " >> set-vs-env.sh' \
 
   402       $ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' \
 
   406             >> $EXTRACT_VC_ENV_BAT_FILE
 
   403           >> $EXTRACT_VC_ENV_BAT_FILE
 
   407         $ECHO 'echo WindowsSdkDir="%WindowsSdkDir% " >> set-vs-env.sh' \
 
       
   408             >> $EXTRACT_VC_ENV_BAT_FILE
 
       
   409         $ECHO 'echo WINDOWSSDKDIR="%WINDOWSSDKDIR% " >> set-vs-env.sh' \
 
       
   410             >> $EXTRACT_VC_ENV_BAT_FILE
 
       
   411       else
 
       
   412         # These will end up something like:
 
       
   413         # C:/CygWin/bin/bash -c 'echo VS_PATH=\"$PATH\" > localdevenv.sh
 
       
   414         # The trailing space for everyone except PATH is no typo, but is needed due
 
       
   415         # to trailing \ in the Windows paths. These will be stripped later.
 
       
   416         $ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' \
 
       
   417             >> $EXTRACT_VC_ENV_BAT_FILE
 
       
   418         $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE\;$include \" >> set-vs-env.sh' \
 
       
   419             >> $EXTRACT_VC_ENV_BAT_FILE
 
       
   420         $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB\;$lib \" >> set-vs-env.sh' \
 
       
   421             >> $EXTRACT_VC_ENV_BAT_FILE
 
       
   422         $ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' \
 
       
   423             >> $EXTRACT_VC_ENV_BAT_FILE
 
       
   424         $ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' \
 
       
   425             >> $EXTRACT_VC_ENV_BAT_FILE
 
       
   426         $ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' \
 
       
   427             >> $EXTRACT_VC_ENV_BAT_FILE
 
       
   428       fi
 
   404 
   429 
   405       # Now execute the newly created bat file.
 
   430       # Now execute the newly created bat file.
 
   406       # The | cat is to stop SetEnv.Cmd to mess with system colors on msys.
 
   431       # The | cat is to stop SetEnv.Cmd to mess with system colors on msys.
 
   407       # Change directory so we don't need to mess with Windows paths in redirects.
 
   432       # Change directory so we don't need to mess with Windows paths in redirects.
 
   408       cd $VS_ENV_TMP_DIR
 
   433       cd $VS_ENV_TMP_DIR
 
   409       cmd /c extract-vs-env.bat | $CAT
 
   434       $CMD /c extract-vs-env.bat | $CAT
 
   410       cd $CURDIR
 
   435       cd $CURDIR
 
   411 
   436 
   412       if test ! -s $VS_ENV_TMP_DIR/set-vs-env.sh; then
 
   437       if test ! -s $VS_ENV_TMP_DIR/set-vs-env.sh; then
 
   413         AC_MSG_NOTICE([Could not succesfully extract the envionment variables needed for the VS setup.])
 
   438         AC_MSG_NOTICE([Could not succesfully extract the environment variables needed for the VS setup.])
 
   414         AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation])
 
   439         AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation])
 
   415         AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.])
 
   440         AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.])
 
   416         AC_MSG_ERROR([Cannot continue])
 
   441         AC_MSG_ERROR([Cannot continue])
 
   417       fi
 
   442       fi
 
       
   443 
       
   444       # Remove windows line endings
 
       
   445       $SED -i -e 's|\r||g' $VS_ENV_TMP_DIR/set-vs-env.sh
 
   418 
   446 
   419       # Now set all paths and other env variables. This will allow the rest of
 
   447       # Now set all paths and other env variables. This will allow the rest of
 
   420       # the configure script to find and run the compiler in the proper way.
 
   448       # the configure script to find and run the compiler in the proper way.
 
   421       AC_MSG_NOTICE([Setting extracted environment variables])
 
   449       AC_MSG_NOTICE([Setting extracted environment variables])
 
   422       . $VS_ENV_TMP_DIR/set-vs-env.sh
 
   450       . $VS_ENV_TMP_DIR/set-vs-env.sh
 
   453 
   481 
   454       AC_SUBST(VS_PATH)
 
   482       AC_SUBST(VS_PATH)
 
   455       AC_SUBST(VS_INCLUDE)
 
   483       AC_SUBST(VS_INCLUDE)
 
   456       AC_SUBST(VS_LIB)
 
   484       AC_SUBST(VS_LIB)
 
   457 
   485 
   458       # Convert VS_INCLUDE into SYSROOT_CFLAGS
 
       
   459       OLDIFS="$IFS"
 
   486       OLDIFS="$IFS"
 
   460       IFS=";"
 
   487       IFS=";"
 
       
   488       if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
 
       
   489         # Convert VS_PATH to unix style
 
       
   490         VS_PATH_WINDOWS="$VS_PATH"
 
       
   491         VS_PATH=""
 
       
   492         for i in $VS_PATH_WINDOWS; do
 
       
   493           path=$i
 
       
   494           # Only process non-empty elements
 
       
   495           if test "x$path" != x; then
 
       
   496             IFS="$OLDIFS"
 
       
   497             # Check that directory exists before calling fixup_path
 
       
   498             testpath=$path
 
       
   499             BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath])
 
       
   500             if test -d "$testpath"; then
 
       
   501               BASIC_FIXUP_PATH([path])
 
       
   502               BASIC_APPEND_TO_PATH(VS_PATH, $path)
 
       
   503             fi
 
       
   504             IFS=";"
 
       
   505           fi
 
       
   506         done
 
       
   507       fi
 
       
   508       # Convert VS_INCLUDE into SYSROOT_CFLAGS
 
   461       for i in $VS_INCLUDE; do
 
   509       for i in $VS_INCLUDE; do
 
   462         ipath=$i
 
   510         ipath=$i
 
   463         # Only process non-empty elements
 
   511         # Only process non-empty elements
 
   464         if test "x$ipath" != x; then
 
   512         if test "x$ipath" != x; then
 
   465           IFS="$OLDIFS"
 
   513           IFS="$OLDIFS"
 
   488           fi
 
   536           fi
 
   489           IFS=";"
 
   537           IFS=";"
 
   490         fi
 
   538         fi
 
   491       done
 
   539       done
 
   492       IFS="$OLDIFS"
 
   540       IFS="$OLDIFS"
 
       
   541 
       
   542       AC_SUBST(VS_PATH_WINDOWS)
 
   493     fi
 
   543     fi
 
   494   else
 
   544   else
 
   495     AC_MSG_RESULT([not found])
 
   545     AC_MSG_RESULT([not found])
 
   496 
   546 
   497     if test "x$VS_ENV_CMD" = x; then
 
   547     if test "x$VS_ENV_CMD" = x; then
 
   598     if test "x$VS100COMNTOOLS" != x; then
 
   648     if test "x$VS100COMNTOOLS" != x; then
 
   599       CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
 
   649       CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.."
 
   600       BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VS_TOOLS_DIR)
 
   650       BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VS_TOOLS_DIR)
 
   601       if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
 
   651       if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
 
   602         POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
 
   652         POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
 
   603 	    | $GREP -i /x64/ | $HEAD --lines 1`
 
   653         | $GREP -i /x64/ | $HEAD --lines 1`
 
   604       else
 
   654       else
 
   605         POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
 
   655         POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \
 
   606 	    | $GREP -i /x86/ | $HEAD --lines 1`
 
   656         | $GREP -i /x86/ | $HEAD --lines 1`
 
   607       fi
 
   657       fi
 
   608       TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
 
   658       TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
 
   609           [search of VS100COMNTOOLS])
 
   659           [search of VS100COMNTOOLS])
 
   610     fi
 
   660     fi
 
   611   fi
 
   661   fi
 
   614     # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
 
   664     # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now.
 
   615     # (This was the original behaviour; kept since it might turn something up)
 
   665     # (This was the original behaviour; kept since it might turn something up)
 
   616     if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
 
   666     if test "x$CYGWIN_VC_INSTALL_DIR" != x; then
 
   617       if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
 
   667       if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
 
   618         POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
 
   668         POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
 
   619 	    | $GREP x64 | $HEAD --lines 1`
 
   669         | $GREP x64 | $HEAD --lines 1`
 
   620       else
 
   670       else
 
   621         POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
 
   671         POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
 
   622 	    | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
 
   672         | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1`
 
   623         if test "x$POSSIBLE_MSVC_DLL" = x; then
 
   673         if test "x$POSSIBLE_MSVC_DLL" = x; then
 
   624           # We're grasping at straws now...
 
   674           # We're grasping at straws now...
 
   625           POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
 
   675           POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \
 
   626 	      | $HEAD --lines 1`
 
   676           | $HEAD --lines 1`
 
   627         fi
 
   677         fi
 
   628       fi
 
   678       fi
 
   629 
   679 
   630       TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
 
   680       TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL],
 
   631           [search of VCINSTALLDIR])
 
   681           [search of VCINSTALLDIR])
 
   691       [path to Microsoft Windows Kit UCRT DLL dir (Windows only) @<:@probed@:>@])])
 
   741       [path to Microsoft Windows Kit UCRT DLL dir (Windows only) @<:@probed@:>@])])
 
   692 
   742 
   693   if test "x$USE_UCRT" = "xtrue"; then
 
   743   if test "x$USE_UCRT" = "xtrue"; then
 
   694     AC_MSG_CHECKING([for UCRT DLL dir])
 
   744     AC_MSG_CHECKING([for UCRT DLL dir])
 
   695     if test "x$with_ucrt_dll_dir" != x; then
 
   745     if test "x$with_ucrt_dll_dir" != x; then
 
   696       if test -z "$(ls -d "$with_ucrt_dll_dir/*.dll" 2> /dev/null)"; then
 
   746       if test -z "$(ls -d $with_ucrt_dll_dir/*.dll 2> /dev/null)"; then
 
   697         AC_MSG_RESULT([no])
 
   747         AC_MSG_RESULT([no])
 
   698         AC_MSG_ERROR([Could not find any dlls in $with_ucrt_dll_dir])
 
   748         AC_MSG_ERROR([Could not find any dlls in $with_ucrt_dll_dir])
 
   699       else
 
   749       else
 
   700         AC_MSG_RESULT([$with_ucrt_dll_dir])
 
   750         AC_MSG_RESULT([$with_ucrt_dll_dir])
 
   701         UCRT_DLL_DIR="$with_ucrt_dll_dir"
 
   751         UCRT_DLL_DIR="$with_ucrt_dll_dir"
 
   711       if test "x$dll_subdir" = "xx86_64"; then
 
   761       if test "x$dll_subdir" = "xx86_64"; then
 
   712         dll_subdir="x64"
 
   762         dll_subdir="x64"
 
   713       fi
 
   763       fi
 
   714       UCRT_DLL_DIR="$CYGWIN_WINDOWSSDKDIR/Redist/ucrt/DLLs/$dll_subdir"
 
   764       UCRT_DLL_DIR="$CYGWIN_WINDOWSSDKDIR/Redist/ucrt/DLLs/$dll_subdir"
 
   715       if test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then
 
   765       if test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then
 
   716         AC_MSG_RESULT([no])
 
   766         # Try with version subdir
 
   717         AC_MSG_ERROR([Could not find any dlls in $UCRT_DLL_DIR])
 
   767         UCRT_DLL_DIR="`ls -d $CYGWIN_WINDOWSSDKDIR/Redist/*/ucrt/DLLs/$dll_subdir \
 
       
   768             2> /dev/null | $SORT -d | $HEAD -n1`"
 
       
   769         if test -z "$UCRT_DLL_DIR" \
 
       
   770             || test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then
 
       
   771           AC_MSG_RESULT([no])
 
       
   772           AC_MSG_ERROR([Could not find any dlls in $UCRT_DLL_DIR])
 
       
   773         else
 
       
   774           AC_MSG_RESULT($UCRT_DLL_DIR)
 
       
   775         fi
 
   718       else
 
   776       else
 
   719         AC_MSG_RESULT($UCRT_DLL_DIR)
 
   777         AC_MSG_RESULT($UCRT_DLL_DIR)
 
   720       fi
 
   778       fi
 
   721     fi
 
   779     fi
 
   722   else
 
   780   else
jdk-sandbox