505 AC_MSG_CHECKING([found $DLL_NAME architecture])
506 MSVC_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVC_DLL"`
507 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
508 # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
509 # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
510 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
511 CORRECT_MSVCR_ARCH="PE32 executable"
512 else
513 CORRECT_MSVCR_ARCH="PE32+ executable"
514 fi
515 else
516 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
517 CORRECT_MSVCR_ARCH=386
518 else
519 CORRECT_MSVCR_ARCH=x86-64
520 fi
521 fi
522 if $ECHO "$MSVC_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
523 AC_MSG_RESULT([ok])
524 MSVC_DLL="$POSSIBLE_MSVC_DLL"
525 BASIC_FIXUP_PATH(MSVC_DLL)
526 AC_MSG_CHECKING([for $DLL_NAME])
527 AC_MSG_RESULT([$MSVC_DLL])
528 else
529 AC_MSG_RESULT([incorrect, ignoring])
530 AC_MSG_NOTICE([The file type of the located $DLL_NAME is $MSVC_DLL_FILETYPE])
531 fi
532 fi
533 ])
534
535 AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
536 [
537 DLL_NAME="$1"
538 MSVC_DLL=
539
540 if test "x$MSVC_DLL" = x; then
541 if test "x$VCINSTALLDIR" != x; then
542 CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
543 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VC_INSTALL_DIR)
544 if test "$VS_VERSION" -lt 2017; then
545 # Probe: Using well-known location from Visual Studio 12.0 and older
|
505 AC_MSG_CHECKING([found $DLL_NAME architecture])
506 MSVC_DLL_FILETYPE=`$FILE -b "$POSSIBLE_MSVC_DLL"`
507 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
508 # The MSYS 'file' command returns "PE32 executable for MS Windows (DLL) (GUI) Intel 80386 32-bit"
509 # on x32 and "PE32+ executable for MS Windows (DLL) (GUI) Mono/.Net assembly" on x64 systems.
510 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
511 CORRECT_MSVCR_ARCH="PE32 executable"
512 else
513 CORRECT_MSVCR_ARCH="PE32+ executable"
514 fi
515 else
516 if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then
517 CORRECT_MSVCR_ARCH=386
518 else
519 CORRECT_MSVCR_ARCH=x86-64
520 fi
521 fi
522 if $ECHO "$MSVC_DLL_FILETYPE" | $GREP "$CORRECT_MSVCR_ARCH" 2>&1 > /dev/null; then
523 AC_MSG_RESULT([ok])
524 MSVC_DLL="$POSSIBLE_MSVC_DLL"
525 AC_MSG_CHECKING([for $DLL_NAME])
526 AC_MSG_RESULT([$MSVC_DLL])
527 else
528 AC_MSG_RESULT([incorrect, ignoring])
529 AC_MSG_NOTICE([The file type of the located $DLL_NAME is $MSVC_DLL_FILETYPE])
530 fi
531 fi
532 ])
533
534 AC_DEFUN([TOOLCHAIN_SETUP_MSVC_DLL],
535 [
536 DLL_NAME="$1"
537 MSVC_DLL=
538
539 if test "x$MSVC_DLL" = x; then
540 if test "x$VCINSTALLDIR" != x; then
541 CYGWIN_VC_INSTALL_DIR="$VCINSTALLDIR"
542 BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(CYGWIN_VC_INSTALL_DIR)
543 if test "$VS_VERSION" -lt 2017; then
544 # Probe: Using well-known location from Visual Studio 12.0 and older
|