equal
deleted
inserted
replaced
110 )) |
110 )) |
111 |
111 |
112 JLINK_JRE_TARGETS := $(jlink_jre) |
112 JLINK_JRE_TARGETS := $(jlink_jre) |
113 |
113 |
114 ifeq ($(BUILD_CDS_ARCHIVE), true) |
114 ifeq ($(BUILD_CDS_ARCHIVE), true) |
115 CDS_ARCHIVE := lib/server/classes.jsa |
115 ifeq ($(OPENJDK_TARGET_OS), windows) |
|
116 CDS_ARCHIVE := bin/server/classes.jsa |
|
117 else |
|
118 CDS_ARCHIVE := lib/server/classes.jsa |
|
119 endif |
116 |
120 |
117 $(eval $(call SetupExecute, gen_cds_archive_jdk, \ |
121 $(eval $(call SetupExecute, gen_cds_archive_jdk, \ |
118 WARN := Creating CDS archive for jdk image, \ |
122 WARN := Creating CDS archive for jdk image, \ |
119 DEPS := $(jlink_jdk), \ |
123 DEPS := $(jlink_jdk), \ |
120 OUTPUT_FILE := $(JDK_IMAGE_DIR)/$(CDS_ARCHIVE), \ |
124 OUTPUT_FILE := $(JDK_IMAGE_DIR)/$(CDS_ARCHIVE), \ |