8247676: vcruntime140_1.dll is not needed on 32-bit Windows

Reviewed-by: phh Backport-of: 78ba1e5a5f69909ddf073cb014784127b09dd47d
openjdk · Dec 1, 2022 · fcd3c9c · fcd3c9c · openjdk-notifier · Dec 1, 2022
1 parent 1ec7984
commit fcd3c9c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh
@@ -4422,7 +4422,7 @@ VS_TOOLSET_SUPPORTED_2019=false
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1669201939
+DATE_WHEN_GENERATED=1669893448
 
 ###############################################################################
 #
@@ -52458,7 +52458,7 @@ if test "${with_vcruntime_1_dll+set}" = set; then :
 fi
 
 
-  if test "x$VCRUNTIME_1_NAME" != "x"; then
+  if test "x$VCRUNTIME_1_NAME" != "x" && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
     if test "x$with_vcruntime_1_dll" != x; then
       # If given explicitly by user, do not probe. If not present, fail directly.
 

diff --git a/common/autoconf/toolchain_windows.m4 b/common/autoconf/toolchain_windows.m4
@@ -666,7 +666,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS],
   AC_ARG_WITH(vcruntime-1-dll, [AS_HELP_STRING([--with-vcruntime-1-dll],
       [path to microsoft C++ runtime dll (vcruntime*_1.dll) (Windows only) @<:@probed@:>@])])
 
-  if test "x$VCRUNTIME_1_NAME" != "x"; then
+  if test "x$VCRUNTIME_1_NAME" != "x" && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
     if test "x$with_vcruntime_1_dll" != x; then
       # If given explicitly by user, do not probe. If not present, fail directly.
       TOOLCHAIN_CHECK_POSSIBLE_MSVC_DLL($VCRUNTIME_1_NAME, [$with_vcruntime_1_dll],