make/Images.gmk

@@ -125,11 +125,11 @@
     /java.base/sun/** \
     /java.base/com/** \
     /jdk.localedata/** \
     #
 
-JLINK_TOOL := $(JLINK) --modulepath $(IMAGES_OUTPUTDIR)/jmods \
+JLINK_TOOL := $(JLINK) --module-path $(IMAGES_OUTPUTDIR)/jmods \
     --endian $(OPENJDK_BUILD_CPU_ENDIAN) \
     --release-info $(BASE_RELEASE_FILE) \
     --order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
     #
 

@@ -140,46 +140,46 @@
 $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
     $(call DependOnVariable, JDK_MODULES_LIST) $(BASE_RELEASE_FILE)
         $(ECHO) Creating jdk jimage
         $(RM) -r $(JDK_IMAGE_DIR)
         $(JLINK_TOOL) --output $(JDK_IMAGE_DIR) \
-            --addmods $(JDK_MODULES_LIST) $(JLINK_EXTRA_OPTS)
+            --add-modules $(JDK_MODULES_LIST) $(JLINK_EXTRA_OPTS)
         $(TOUCH) $@
 
 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
     $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE)
         $(ECHO) Creating jre jimage
         $(RM) -r $(JRE_IMAGE_DIR)
         $(JLINK_TOOL) --output $(JRE_IMAGE_DIR) \
-            --addmods $(JRE_MODULES_LIST)
+            --add-modules $(JRE_MODULES_LIST)
         $(TOUCH) $@
 
 JRE_COMPACT1_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact1
 JRE_COMPACT2_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact2
 JRE_COMPACT3_IMAGE_DIR := $(JRE_IMAGE_DIR)-compact3
 
 $(JRE_COMPACT1_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
     $(call DependOnVariable, JRE_COMPACT1_MODULES_LIST) $(BASE_RELEASE_FILE)
         $(ECHO) Creating jre compact1 jimage
         $(RM) -r $(JRE_COMPACT1_IMAGE_DIR)
-        $(JLINK_TOOL) --addmods $(JRE_COMPACT1_MODULES_LIST) \
+        $(JLINK_TOOL) --add-modules $(JRE_COMPACT1_MODULES_LIST) \
             --output $(JRE_COMPACT1_IMAGE_DIR)
         $(TOUCH) $@
 
 $(JRE_COMPACT2_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
     $(call DependOnVariable, JRE_COMPACT2_MODULES_LIST) $(BASE_RELEASE_FILE)
         $(ECHO) Creating jre compact2 jimage
         $(RM) -r $(JRE_COMPACT2_IMAGE_DIR)
-        $(JLINK_TOOL) --addmods $(JRE_COMPACT2_MODULES_LIST) \
+        $(JLINK_TOOL) --add-modules $(JRE_COMPACT2_MODULES_LIST) \
             --output $(JRE_COMPACT2_IMAGE_DIR)
         $(TOUCH) $@
 
 $(JRE_COMPACT3_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \
     $(call DependOnVariable, JRE_COMPACT3_MODULES_LIST) $(BASE_RELEASE_FILE)
         $(ECHO) Creating jre compact3 jimage
         $(RM) -r $(JRE_COMPACT3_IMAGE_DIR)
-        $(JLINK_TOOL) --addmods $(JRE_COMPACT3_MODULES_LIST) \
+        $(JLINK_TOOL) --add-modules $(JRE_COMPACT3_MODULES_LIST) \
             --output $(JRE_COMPACT3_IMAGE_DIR)
         $(TOUCH) $@
 
 TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)
 TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE)