8226404: bootcycle build uses wrong CDS archive
authorerikj
Thu, 20 Jun 2019 07:56:28 -0700
changeset 55453 65916ade7fa2
parent 55452 1170b6d92d1c
child 55454 8892555795cd
8226404: bootcycle build uses wrong CDS archive Reviewed-by: iklam
make/autoconf/bootcycle-spec.gmk.in
--- a/make/autoconf/bootcycle-spec.gmk.in	Wed Jun 19 21:49:33 2019 -0700
+++ b/make/autoconf/bootcycle-spec.gmk.in	Thu Jun 20 07:56:28 2019 -0700
@@ -62,3 +62,7 @@
 endif
 # The bootcycle JVM arguments may differ from the original boot jdk.
 JAVA_FLAGS_BIG := @BOOTCYCLE_JVM_ARGS_BIG@
+# Any CDS settings generated for the bootjdk are invalid in the bootcycle build.
+# By filtering out those JVM args, the bootcycle JVM will use its default
+# settings for CDS.
+JAVA_FLAGS := $(filter-out -XX:SharedArchiveFile% -Xshare%, $(JAVA_FLAGS))