< prev index next >

make/autoconf/toolchain_windows.m4

Print this page

        

*** 1,7 **** # ! # Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this --- 1,7 ---- # ! # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License version 2 only, as # published by the Free Software Foundation. Oracle designates this
*** 23,33 **** # questions. # ################################################################################ # The order of these defines the priority by which we try to find them. ! VALID_VS_VERSIONS="2017 2019 2013 2015 2012 2010" VS_DESCRIPTION_2010="Microsoft Visual Studio 2010" VS_VERSION_INTERNAL_2010=100 VS_MSVCR_2010=msvcr100.dll # We don't use msvcp on Visual Studio 2010 --- 23,33 ---- # questions. # ################################################################################ # The order of these defines the priority by which we try to find them. ! VALID_VS_VERSIONS="2017 2013 2015 2012 2010" VS_DESCRIPTION_2010="Microsoft Visual Studio 2010" VS_VERSION_INTERNAL_2010=100 VS_MSVCR_2010=msvcr100.dll # We don't use msvcp on Visual Studio 2010
*** 85,109 **** VS_EDITIONS_2017="BuildTools Community Professional Enterprise" VS_SDK_INSTALLDIR_2017= VS_VS_PLATFORM_NAME_2017="v141" VS_SDK_PLATFORM_NAME_2017= VS_SUPPORTED_2017=true - VS_TOOLSET_SUPPORTED_2017=true - - VS_DESCRIPTION_2019="Microsoft Visual Studio 2019" - VS_VERSION_INTERNAL_2019=141 - VS_MSVCR_2019=vcruntime140.dll - VS_MSVCP_2019=msvcp140.dll - VS_ENVVAR_2019="VS160COMNTOOLS" - VS_USE_UCRT_2019="true" - VS_VS_INSTALLDIR_2019="Microsoft Visual Studio/2019" - VS_EDITIONS_2019="BuildTools Community Professional Enterprise" - VS_SDK_INSTALLDIR_2019= - VS_VS_PLATFORM_NAME_2019="v142" - VS_SDK_PLATFORM_NAME_2019= - VS_SUPPORTED_2019=false - VS_TOOLSET_SUPPORTED_2019=false ################################################################################ AC_DEFUN([TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT], [ --- 85,94 ----
*** 111,121 **** VS_VERSION="$1" VS_BASE="$2" METHOD="$3" BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VS_BASE) ! # In VS 2017 and VS 2019, the default installation is in a subdir named after the edition. # Find the first one present and use that. if test "x$VS_EDITIONS" != x; then for edition in $VS_EDITIONS; do if test -d "$VS_BASE/$edition"; then VS_BASE="$VS_BASE/$edition" --- 96,106 ---- VS_VERSION="$1" VS_BASE="$2" METHOD="$3" BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VS_BASE) ! # In VS 2017, the default installation is in a subdir named after the edition. # Find the first one present and use that. if test "x$VS_EDITIONS" != x; then for edition in $VS_EDITIONS; do if test -d "$VS_BASE/$edition"; then VS_BASE="$VS_BASE/$edition"
*** 128,138 **** AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD]) if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then VCVARSFILES="vc/bin/vcvars32.bat vc/auxiliary/build/vcvars32.bat" else VCVARSFILES="vc/bin/amd64/vcvars64.bat vc/bin/x86_amd64/vcvarsx86_amd64.bat \ ! VC/Auxiliary/Build/vcvarsx86_amd64.bat VC/Auxiliary/Build/vcvars64.bat" fi for VCVARSFILE in $VCVARSFILES; do if test -f "$VS_BASE/$VCVARSFILE"; then VS_ENV_CMD="$VS_BASE/$VCVARSFILE" --- 113,123 ---- AC_MSG_NOTICE([Found Visual Studio installation at $VS_BASE using $METHOD]) if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then VCVARSFILES="vc/bin/vcvars32.bat vc/auxiliary/build/vcvars32.bat" else VCVARSFILES="vc/bin/amd64/vcvars64.bat vc/bin/x86_amd64/vcvarsx86_amd64.bat \ ! vc/auxiliary/build/vcvarsx86_amd64.bat vc/auxiliary/build/vcvars64.bat" fi for VCVARSFILE in $VCVARSFILES; do if test -f "$VS_BASE/$VCVARSFILE"; then VS_ENV_CMD="$VS_BASE/$VCVARSFILE"
*** 190,216 **** ################################################################################ # Finds the bat or cmd file in Visual Studio or the SDK that sets up a proper # build environment and assigns it to VS_ENV_CMD AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO_BAT_FILE], [ - # VS2017 provides the option to install previous minor versions of the MSVC - # toolsets. It is not possible to directly download earlier minor versions of - # VS2017 and in order to build with a previous minor compiler toolset version, - # it is now possible to compile with earlier minor versions by passing - # -vcvars_ver=<toolset_version> argument to vcvarsall.bat. - AC_ARG_WITH(msvc-toolset-version, [AS_HELP_STRING([--with-msvc-toolset-version], - [specific MSVC toolset version to use, passed as -vcvars_ver argument to - pass to vcvarsall.bat (Windows only)])]) - VS_VERSION="$1" eval VS_COMNTOOLS_VAR="\${VS_ENVVAR_${VS_VERSION}}" eval VS_COMNTOOLS="\$${VS_COMNTOOLS_VAR}" eval VS_INSTALL_DIR="\${VS_VS_INSTALLDIR_${VS_VERSION}}" eval VS_EDITIONS="\${VS_EDITIONS_${VS_VERSION}}" eval SDK_INSTALL_DIR="\${VS_SDK_INSTALLDIR_${VS_VERSION}}" eval VS_ENV_ARGS="\${VS_ENV_ARGS_${VS_VERSION}}" - eval VS_TOOLSET_SUPPORTED="\${VS_TOOLSET_SUPPORTED_${VS_VERSION}}" # When using --with-tools-dir, assume it points to the correct and default # version of Visual Studio or that --with-toolchain-version was also set. if test "x$with_tools_dir" != x; then TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}], --- 175,191 ----
*** 245,254 **** --- 220,230 ---- fi TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}], [C:/Program Files/$VS_INSTALL_DIR], [well-known name]) TOOLCHAIN_CHECK_POSSIBLE_VISUAL_STUDIO_ROOT([${VS_VERSION}], [C:/Program Files (x86)/$VS_INSTALL_DIR], [well-known name]) + if test "x$SDK_INSTALL_DIR" != x; then if test "x$ProgramW6432" != x; then TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([${VS_VERSION}], [$ProgramW6432/$SDK_INSTALL_DIR], [well-known name]) fi
*** 263,278 **** TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([${VS_VERSION}], [C:/Program Files/$SDK_INSTALL_DIR], [well-known name]) TOOLCHAIN_CHECK_POSSIBLE_WIN_SDK_ROOT([${VS_VERSION}], [C:/Program Files (x86)/$SDK_INSTALL_DIR], [well-known name]) fi - - if test "x$VS_TOOLSET_SUPPORTED" != x; then - if test "x$with_msvc_toolset_version" != x; then - VS_ENV_ARGS="$VS_ENV_ARGS -vcvars_ver=$with_msvc_toolset_version" - fi - fi ]) ################################################################################ AC_DEFUN([TOOLCHAIN_FIND_VISUAL_STUDIO], --- 239,248 ----
*** 301,330 **** eval MSVCR_NAME="\${VS_MSVCR_${VS_VERSION}}" eval MSVCP_NAME="\${VS_MSVCP_${VS_VERSION}}" eval USE_UCRT="\${VS_USE_UCRT_${VS_VERSION}}" eval VS_SUPPORTED="\${VS_SUPPORTED_${VS_VERSION}}" eval PLATFORM_TOOLSET="\${VS_VS_PLATFORM_NAME_${VS_VERSION}}" ! ! # The TOOLCHAIN_PATH from a devkit is in Unix format. In WSL we need a ! # windows version of the complete VS_PATH as VS_PATH_WINDOWS ! if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then ! # Convert the toolchain path ! OLDIFS="$IFS" ! IFS=":" ! VS_PATH_WINDOWS="" ! for i in $TOOLCHAIN_PATH; do ! path=$i ! BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([path]) ! VS_PATH_WINDOWS="$VS_PATH_WINDOWS;$path" ! done ! IFS="$OLDIFS" ! # Append the current path from Windows env ! WINDOWS_PATH="`$CMD /c echo %PATH%`" ! VS_PATH_WINDOWS="$VS_PATH_WINDOWS;$WINDOWS_PATH" ! else ! VS_PATH="$TOOLCHAIN_PATH:$PATH" ! fi # Convert DEVKIT_VS_INCLUDE into windows style VS_INCLUDE so that it # can still be exported as INCLUDE for compiler invocations without # SYSROOT_CFLAGS OLDIFS="$IFS" --- 271,281 ---- eval MSVCR_NAME="\${VS_MSVCR_${VS_VERSION}}" eval MSVCP_NAME="\${VS_MSVCP_${VS_VERSION}}" eval USE_UCRT="\${VS_USE_UCRT_${VS_VERSION}}" eval VS_SUPPORTED="\${VS_SUPPORTED_${VS_VERSION}}" eval PLATFORM_TOOLSET="\${VS_VS_PLATFORM_NAME_${VS_VERSION}}" ! VS_PATH="$TOOLCHAIN_PATH:$PATH" # Convert DEVKIT_VS_INCLUDE into windows style VS_INCLUDE so that it # can still be exported as INCLUDE for compiler invocations without # SYSROOT_CFLAGS OLDIFS="$IFS"
*** 386,396 **** # the set env variables into the spec file. AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV], [ # Store path to cygwin link.exe to help excluding it when searching for # VS linker. This must be done before changing the PATH when looking for VS. ! AC_PATH_PROG(CYGWIN_LINK, link.exe) if test "x$CYGWIN_LINK" != x; then AC_MSG_CHECKING([if the first found link.exe is actually the Cygwin link tool]) "$CYGWIN_LINK" --version > /dev/null if test $? -eq 0 ; then AC_MSG_RESULT([yes]) --- 337,347 ---- # the set env variables into the spec file. AC_DEFUN([TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV], [ # Store path to cygwin link.exe to help excluding it when searching for # VS linker. This must be done before changing the PATH when looking for VS. ! AC_PATH_PROG(CYGWIN_LINK, link) if test "x$CYGWIN_LINK" != x; then AC_MSG_CHECKING([if the first found link.exe is actually the Cygwin link tool]) "$CYGWIN_LINK" --version > /dev/null if test $? -eq 0 ; then AC_MSG_RESULT([yes])
*** 419,539 **** # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment). # Instead create a shell script which will set the relevant variables when run. WINPATH_VS_ENV_CMD="$VS_ENV_CMD" BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([WINPATH_VS_ENV_CMD]) ! ! if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then ! WINPATH_BASH="bash" ! else ! WINPATH_BASH="$BASH" ! BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([WINPATH_BASH]) ! fi # Generate a DOS batch file which runs $VS_ENV_CMD, and then creates a shell # script (executable by bash) that will setup the important variables. EXTRACT_VC_ENV_BAT_FILE="$VS_ENV_TMP_DIR/extract-vs-env.bat" $ECHO "@echo off" > $EXTRACT_VC_ENV_BAT_FILE # This will end up something like: # call C:/progra~2/micros~2.0/vc/bin/amd64/vcvars64.bat ! $ECHO "call \"$WINPATH_VS_ENV_CMD\" $VS_ENV_ARGS" >> $EXTRACT_VC_ENV_BAT_FILE # In some cases, the VS_ENV_CMD will change directory, change back so # the set-vs-env.sh ends up in the right place. $ECHO 'cd %~dp0' >> $EXTRACT_VC_ENV_BAT_FILE ! if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then ! # These will end up something like: ! # echo VS_PATH=\"$PATH\" > set-vs-env.sh ! # The trailing space for everyone except PATH is no typo, but is needed due ! # to trailing \ in the Windows paths. These will be stripped later. ! # Trying pure CMD extract. This results in windows paths that need to ! # be converted post extraction, but a simpler script. ! $ECHO 'echo VS_PATH="%PATH%" > set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO 'echo VS_INCLUDE="%INCLUDE% " >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO 'echo VS_LIB="%LIB% " >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO 'echo VCINSTALLDIR="%VCINSTALLDIR% " >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO 'echo VCToolsRedistDir="%VCToolsRedistDir% " >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO 'echo WindowsSdkDir="%WindowsSdkDir% " >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO 'echo WINDOWSSDKDIR="%WINDOWSSDKDIR% " >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! else ! # These will end up something like: ! # C:/CygWin/bin/bash -c 'echo VS_PATH=\"$PATH\" > localdevenv.sh ! # The trailing space for everyone except PATH is no typo, but is needed due ! # to trailing \ in the Windows paths. These will be stripped later. ! $ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE\;$include \" >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB\;$lib \" >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO "$WINPATH_BASH -c 'echo VCToolsRedistDir="'\"$VCToolsRedistDir \" >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! fi # Now execute the newly created bat file. # The | cat is to stop SetEnv.Cmd to mess with system colors on msys. # Change directory so we don't need to mess with Windows paths in redirects. cd $VS_ENV_TMP_DIR ! $CMD /c extract-vs-env.bat | $CAT ! cd $CONFIGURE_START_DIR if test ! -s $VS_ENV_TMP_DIR/set-vs-env.sh; then ! AC_MSG_NOTICE([Could not succesfully extract the environment variables needed for the VS setup.]) AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation]) AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.]) AC_MSG_ERROR([Cannot continue]) fi - # Remove windows line endings - $SED -i -e 's|\r||g' $VS_ENV_TMP_DIR/set-vs-env.sh - # Now set all paths and other env variables. This will allow the rest of # the configure script to find and run the compiler in the proper way. AC_MSG_NOTICE([Setting extracted environment variables]) . $VS_ENV_TMP_DIR/set-vs-env.sh # Now we have VS_PATH, VS_INCLUDE, VS_LIB. For further checking, we # also define VCINSTALLDIR, WindowsSdkDir and WINDOWSSDKDIR. - - # In WSL, the extracted VS_PATH is Windows style. This needs to be - # rewritten as Unix style and the Windows style version is saved - # in VS_PATH_WINDOWS. - if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then - OLDIFS="$IFS" - IFS=";" - # Convert VS_PATH to unix style - VS_PATH_WINDOWS="$VS_PATH" - VS_PATH="" - for i in $VS_PATH_WINDOWS; do - path=$i - # Only process non-empty elements - if test "x$path" != x; then - IFS="$OLDIFS" - # Check that directory exists before calling fixup_path - testpath=$path - BASIC_WINDOWS_REWRITE_AS_UNIX_PATH([testpath]) - if test -d "$testpath"; then - BASIC_FIXUP_PATH([path]) - BASIC_APPEND_TO_PATH(VS_PATH, $path) - fi - IFS=";" - fi - done - IFS="$OLDIFS" - fi - else # We did not find a vsvars bat file, let's hope we are run from a VS command prompt. AC_MSG_NOTICE([Cannot locate a valid Visual Studio installation, checking current environment]) fi fi --- 370,429 ---- # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment). # Instead create a shell script which will set the relevant variables when run. WINPATH_VS_ENV_CMD="$VS_ENV_CMD" BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([WINPATH_VS_ENV_CMD]) ! WINPATH_BASH="$BASH" ! BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH([WINPATH_BASH]) # Generate a DOS batch file which runs $VS_ENV_CMD, and then creates a shell # script (executable by bash) that will setup the important variables. EXTRACT_VC_ENV_BAT_FILE="$VS_ENV_TMP_DIR/extract-vs-env.bat" $ECHO "@echo off" > $EXTRACT_VC_ENV_BAT_FILE # This will end up something like: # call C:/progra~2/micros~2.0/vc/bin/amd64/vcvars64.bat ! $ECHO "call $WINPATH_VS_ENV_CMD $VS_ENV_ARGS" >> $EXTRACT_VC_ENV_BAT_FILE # In some cases, the VS_ENV_CMD will change directory, change back so # the set-vs-env.sh ends up in the right place. $ECHO 'cd %~dp0' >> $EXTRACT_VC_ENV_BAT_FILE ! # These will end up something like: ! # C:/CygWin/bin/bash -c 'echo VS_PATH=\"$PATH\" > localdevenv.sh ! # The trailing space for everyone except PATH is no typo, but is needed due ! # to trailing \ in the Windows paths. These will be stripped later. ! $ECHO "$WINPATH_BASH -c 'echo VS_PATH="'\"$PATH\" > set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO "$WINPATH_BASH -c 'echo VS_INCLUDE="'\"$INCLUDE\;$include \" >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO "$WINPATH_BASH -c 'echo VS_LIB="'\"$LIB\;$lib \" >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO "$WINPATH_BASH -c 'echo VCINSTALLDIR="'\"$VCINSTALLDIR \" >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO "$WINPATH_BASH -c 'echo WindowsSdkDir="'\"$WindowsSdkDir \" >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE ! $ECHO "$WINPATH_BASH -c 'echo WINDOWSSDKDIR="'\"$WINDOWSSDKDIR \" >> set-vs-env.sh' \ ! >> $EXTRACT_VC_ENV_BAT_FILE # Now execute the newly created bat file. # The | cat is to stop SetEnv.Cmd to mess with system colors on msys. # Change directory so we don't need to mess with Windows paths in redirects. cd $VS_ENV_TMP_DIR ! cmd /c extract-vs-env.bat | $CAT ! cd $CURDIR if test ! -s $VS_ENV_TMP_DIR/set-vs-env.sh; then ! AC_MSG_NOTICE([Could not succesfully extract the envionment variables needed for the VS setup.]) AC_MSG_NOTICE([Try setting --with-tools-dir to the VC/bin directory within the VS installation]) AC_MSG_NOTICE([or run "bash.exe -l" from a VS command prompt and then run configure from there.]) AC_MSG_ERROR([Cannot continue]) fi # Now set all paths and other env variables. This will allow the rest of # the configure script to find and run the compiler in the proper way. AC_MSG_NOTICE([Setting extracted environment variables]) . $VS_ENV_TMP_DIR/set-vs-env.sh # Now we have VS_PATH, VS_INCLUDE, VS_LIB. For further checking, we # also define VCINSTALLDIR, WindowsSdkDir and WINDOWSSDKDIR. else # We did not find a vsvars bat file, let's hope we are run from a VS command prompt. AC_MSG_NOTICE([Cannot locate a valid Visual Studio installation, checking current environment]) fi fi
*** 550,560 **** AC_MSG_RESULT([ok]) # Remove any trailing "\" ";" and " " from the variables. VS_INCLUDE=`$ECHO "$VS_INCLUDE" | $SED -e 's/\\\\*;* *$//'` VS_LIB=`$ECHO "$VS_LIB" | $SED 's/\\\\*;* *$//'` VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'` - VCToolsRedistDir=`$ECHO "$VCToolsRedistDir" | $SED 's/\\\\* *$//'` WindowsSdkDir=`$ECHO "$WindowsSdkDir" | $SED 's/\\\\* *$//'` WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'` if test -z "$WINDOWSSDKDIR"; then WINDOWSSDKDIR="$WindowsSdkDir" fi --- 440,449 ----
*** 599,610 **** fi IFS=";" fi done IFS="$OLDIFS" - - AC_SUBST(VS_PATH_WINDOWS) fi else AC_MSG_RESULT([not found]) if test "x$VS_ENV_CMD" = x; then --- 488,497 ----
*** 672,688 **** POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME" else POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME" fi else ! CYGWIN_VC_TOOLS_REDIST_DIR="$VCToolsRedistDir" ! BASIC_FIXUP_PATH(CYGWIN_VC_TOOLS_REDIST_DIR) ! # Probe: Using well-known location from VS 2017 and VS 2019 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then ! POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_TOOLS_REDIST_DIR/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`" else ! POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_TOOLS_REDIST_DIR/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`" fi fi # In case any of the above finds more than one file, loop over them. for possible_msvc_dll in $POSSIBLE_MSVC_DLL; do $ECHO "POSSIBLE_MSVC_DLL $possible_msvc_dll" --- 559,573 ---- POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME" else POSSIBLE_MSVC_DLL="$CYGWIN_VC_INSTALL_DIR/redist/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME" fi else ! # Probe: Using well-known location from VS 2017 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then ! POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_INSTALL_DIR/Redist/MSVC/*/x64/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`" else ! POSSIBLE_MSVC_DLL="`ls $CYGWIN_VC_INSTALL_DIR/Redist/MSVC/*/x86/Microsoft.VC${VS_VERSION_INTERNAL}.CRT/$DLL_NAME`" fi fi # In case any of the above finds more than one file, loop over them. for possible_msvc_dll in $POSSIBLE_MSVC_DLL; do $ECHO "POSSIBLE_MSVC_DLL $possible_msvc_dll"
*** 713,726 **** if test "x$VS100COMNTOOLS" != x; then CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.." BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VS_TOOLS_DIR) if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \ ! | $GREP -i /x64/ | $HEAD --lines 1` else POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \ ! | $GREP -i /x86/ | $HEAD --lines 1` fi TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL], [search of VS100COMNTOOLS]) fi fi --- 598,611 ---- if test "x$VS100COMNTOOLS" != x; then CYGWIN_VS_TOOLS_DIR="$VS100COMNTOOLS/.." BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VS_TOOLS_DIR) if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \ ! | $GREP -i /x64/ | $HEAD --lines 1` else POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VS_TOOLS_DIR" -name $DLL_NAME \ ! | $GREP -i /x86/ | $HEAD --lines 1` fi TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL], [search of VS100COMNTOOLS]) fi fi
*** 729,746 **** # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now. # (This was the original behaviour; kept since it might turn something up) if test "x$CYGWIN_VC_INSTALL_DIR" != x; then if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \ ! | $GREP x64 | $HEAD --lines 1` else POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \ ! | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1` if test "x$POSSIBLE_MSVC_DLL" = x; then # We're grasping at straws now... POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \ ! | $HEAD --lines 1` fi fi TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL], [search of VCINSTALLDIR]) --- 614,631 ---- # Probe: Search wildly in the VCINSTALLDIR. We've probably lost by now. # (This was the original behaviour; kept since it might turn something up) if test "x$CYGWIN_VC_INSTALL_DIR" != x; then if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \ ! | $GREP x64 | $HEAD --lines 1` else POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \ ! | $GREP x86 | $GREP -v ia64 | $GREP -v x64 | $HEAD --lines 1` if test "x$POSSIBLE_MSVC_DLL" = x; then # We're grasping at straws now... POSSIBLE_MSVC_DLL=`$FIND "$CYGWIN_VC_INSTALL_DIR" -name $DLL_NAME \ ! | $HEAD --lines 1` fi fi TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL([$DLL_NAME], [$POSSIBLE_MSVC_DLL], [search of VCINSTALLDIR])
*** 806,816 **** [path to Microsoft Windows Kit UCRT DLL dir (Windows only) @<:@probed@:>@])]) if test "x$USE_UCRT" = "xtrue"; then AC_MSG_CHECKING([for UCRT DLL dir]) if test "x$with_ucrt_dll_dir" != x; then ! if test -z "$(ls -d $with_ucrt_dll_dir/*.dll 2> /dev/null)"; then AC_MSG_RESULT([no]) AC_MSG_ERROR([Could not find any dlls in $with_ucrt_dll_dir]) else AC_MSG_RESULT([$with_ucrt_dll_dir]) UCRT_DLL_DIR="$with_ucrt_dll_dir" --- 691,701 ---- [path to Microsoft Windows Kit UCRT DLL dir (Windows only) @<:@probed@:>@])]) if test "x$USE_UCRT" = "xtrue"; then AC_MSG_CHECKING([for UCRT DLL dir]) if test "x$with_ucrt_dll_dir" != x; then ! if test -z "$(ls -d "$with_ucrt_dll_dir/*.dll" 2> /dev/null)"; then AC_MSG_RESULT([no]) AC_MSG_ERROR([Could not find any dlls in $with_ucrt_dll_dir]) else AC_MSG_RESULT([$with_ucrt_dll_dir]) UCRT_DLL_DIR="$with_ucrt_dll_dir"
*** 826,845 **** if test "x$dll_subdir" = "xx86_64"; then dll_subdir="x64" fi UCRT_DLL_DIR="$CYGWIN_WINDOWSSDKDIR/Redist/ucrt/DLLs/$dll_subdir" if test -z "$(ls -d "$UCRT_DLL_DIR/"*.dll 2> /dev/null)"; then ! # 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 fi else --- 711,722 ---- if test "x$dll_subdir" = "xx86_64"; then dll_subdir="x64" 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]) else AC_MSG_RESULT($UCRT_DLL_DIR) fi fi else
< prev index next >