make/copy/Copy-java.base.gmk

*** 58,77 ****
    TARGETS += $(LIB_DST_DIR)/tzmappings
  
  endif
  
  ################################################################################
! # Copy msvcrXX.dll on windows
! 
  ifeq ($(OPENJDK_TARGET_OS), windows)
!   MSVCR_TARGET := $(LIB_DST_DIR)/$(notdir $(MSVCR_DLL))
    # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
!   $(MSVCR_TARGET): $(MSVCR_DLL)
!         $(call install-file)
          $(CHMOD) a+rx $@
  
!   TARGETS += $(MSVCR_TARGET)
  endif
  
  ################################################################################
  #
  # How to install jvm.cfg.
--- 58,89 ----
    TARGETS += $(LIB_DST_DIR)/tzmappings
  
  endif
  
  ################################################################################
! # Copy the microsoft runtime libraries on windows
  ifeq ($(OPENJDK_TARGET_OS), windows)
! 
    # Chmod to avoid permission issues if bundles are unpacked on unix platforms.
!   define copy-and-chmod
!         $(install-file)
          $(CHMOD) a+rx $@
+   endef
+ 
+   # Use separate macro calls in case the source files are not in the same
+   # directory.
+   $(eval $(call SetupCopyFiles,COPY_MSVCR, \
+       DEST := $(LIB_DST_DIR), \
+       FILES := $(MSVCR_DLL), \
+       MACRO := copy-and-chmod))
+ 
+   $(eval $(call SetupCopyFiles,COPY_MSVCP, \
+       DEST := $(LIB_DST_DIR), \
+       FILES := $(MSVCP_DLL), \
+       MACRO := copy-and-chmod))
  
!   TARGETS += $(COPY_MSVCR) $(COPY_MSVCP)
  endif
  
  ################################################################################
  #
  # How to install jvm.cfg.