equal
deleted
inserted
replaced
97 $(JLINK_JDK_EXTRA_OPTS) \ |
97 $(JLINK_JDK_EXTRA_OPTS) \ |
98 --output $(JDK_IMAGE_DIR) \ |
98 --output $(JDK_IMAGE_DIR) \ |
99 ) |
99 ) |
100 ifeq ($(BUILD_CDS_ARCHIVE), true) |
100 ifeq ($(BUILD_CDS_ARCHIVE), true) |
101 $(call LogWarn, Creating CDS archive for jdk image) |
101 $(call LogWarn, Creating CDS archive for jdk image) |
102 $(JDK_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M $(LOG_INFO) |
102 $(FIXPATH) $(JDK_IMAGE_DIR)/bin/java \ |
|
103 -Xshare:dump -Xmx128M -Xms128M $(LOG_INFO) |
103 endif |
104 endif |
104 $(TOUCH) $@ |
105 $(TOUCH) $@ |
105 |
106 |
106 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ |
107 $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE): $(JMODS) \ |
107 $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE) |
108 $(call DependOnVariable, JRE_MODULES_LIST) $(BASE_RELEASE_FILE) |
112 $(JLINK_JRE_EXTRA_OPTS) \ |
113 $(JLINK_JRE_EXTRA_OPTS) \ |
113 --output $(JRE_IMAGE_DIR) \ |
114 --output $(JRE_IMAGE_DIR) \ |
114 ) |
115 ) |
115 ifeq ($(BUILD_CDS_ARCHIVE), true) |
116 ifeq ($(BUILD_CDS_ARCHIVE), true) |
116 $(call LogWarn, Creating CDS archive for jre image) |
117 $(call LogWarn, Creating CDS archive for jre image) |
117 $(JRE_IMAGE_DIR)/bin/java -Xshare:dump -Xmx128M -Xms128M $(LOG_INFO) |
118 $(FIXPATH) $(JRE_IMAGE_DIR)/bin/java \ |
|
119 -Xshare:dump -Xmx128M -Xms128M $(LOG_INFO) |
118 endif |
120 endif |
119 $(TOUCH) $@ |
121 $(TOUCH) $@ |
120 |
122 |
121 TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) |
123 TOOL_JRE_TARGETS := $(JRE_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) |
122 TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) |
124 TOOL_JDK_TARGETS := $(JDK_IMAGE_DIR)/$(JIMAGE_TARGET_FILE) |