make/CreateJmods.gmk

*** 116,126 ****
        JMOD_FLAGS += --module-path $(JMODS_DIR) \
            --hash-modules '^(?!$(EXCLUDE_PATTERN)$$)'
      endif
    endif
  else # not java.base
!   ifeq ($(OPENJDK_TARGET_OS), windows)
      # Only java.base needs to include the MSVC*_DLLs. Make sure no other module
      # tries to include them (typically imported ones).
      ifneq ($(MSVCR_DLL), )
        ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(MSVCR_DLL))), )
          JMOD_FLAGS += --exclude '$(notdir $(MSVCR_DLL))'
--- 116,126 ----
        JMOD_FLAGS += --module-path $(JMODS_DIR) \
            --hash-modules '^(?!$(EXCLUDE_PATTERN)$$)'
      endif
    endif
  else # not java.base
!   ifeq ($(call isTargetOs, windows), true)
      # Only java.base needs to include the MSVC*_DLLs. Make sure no other module
      # tries to include them (typically imported ones).
      ifneq ($(MSVCR_DLL), )
        ifneq ($(wildcard $(LIBS_DIR)/$(notdir $(MSVCR_DLL))), )
          JMOD_FLAGS += --exclude '$(notdir $(MSVCR_DLL))'