From d493d4ef9e58f188433d5c09fb6a1ab68a72143e Mon Sep 17 00:00:00 2001 From: kevinw Date: Mon, 29 Oct 2018 14:40:52 -0700 Subject: [PATCH] 8202557: OpenJDK fails to start in Windows 7 and 8.1 after upgrading compiler to VC 2017 Reviewed-by: tbell, erikj --- make/CopyFiles.gmk | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/make/CopyFiles.gmk b/make/CopyFiles.gmk index c447ae13a..98f037803 100644 --- a/make/CopyFiles.gmk +++ b/make/CopyFiles.gmk @@ -269,6 +269,15 @@ ifeq ($(OPENJDK_TARGET_OS), windows) MACRO := copy-and-chmod)) COPY_FILES += $(COPY_MSVCR) $(COPY_MSVCP) + + ifneq ($(UCRT_DLL_DIR), ) + $(eval $(call SetupCopyFiles,COPY_UCRT_DLLS, \ + DEST := $(JDK_OUTPUTDIR)/bin, \ + FILES := $(wildcard $(UCRT_DLL_DIR)/*.dll), \ + MACRO := copy-and-chmod \ + )) + COPY_FILES += $(COPY_UCRT_DLLS) + endif endif ########################################################################################## -- GitLab