make/Images.gmk

@@ -97,11 +97,11 @@
                 $(JLINK_JDK_EXTRA_OPTS) \
                 --output $(JDK_IMAGE_DIR) \
         )
         ifeq ($(BUILD_CDS_ARCHIVE), true)
           $(call LogWarn, Creating CDS archive for jdk image)
-          $(JDK_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M $(LOG_INFO)
+          $(JDK_IMAGE_DIR)/bin/java$(EXE_SUFFIX) -Xshare:dump -Xmx128M -Xms128M $(LOG_INFO)
         endif
         $(TOUCH) $@
 
 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
     $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)

@@ -112,11 +112,11 @@
                 $(JLINK_JRE_EXTRA_OPTS) \
                 --output $(JRE_IMAGE_DIR) \
         )
         ifeq ($(BUILD_CDS_ARCHIVE), true)
           $(call LogWarn, Creating CDS archive for jre image)
-          $(JRE_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M $(LOG_INFO)
+          $(JRE_IMAGE_DIR)/bin/java$(EXE_SUFFIX) -Xshare:dump -Xmx128M -Xms128M $(LOG_INFO)
         endif
         $(TOUCH) $@
 
 TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)