make/autoconf/jdk-options.m4

rev 52036 : 8211837: Creation of the default CDS Archive should depend on ENABLE_CDS

@@ -525,11 +525,11 @@
       Default is to generate it when either the server or client JVMs are built and
       enable-cds is true.])])
 
   # Check if it's likely that it's possible to generate the classlist. Depending
   # on exact jvm configuration it could be possible anyway.
-  if test "x$ENABLE_CDS" = "xtrue" && (HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client)); then
+  if test "x$ENABLE_CDS" = "xtrue" && (HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) || HOTSPOT_CHECK_JVM_FEATURE(cds)); then
     ENABLE_GENERATE_CLASSLIST_POSSIBLE="true"
   else
     ENABLE_GENERATE_CLASSLIST_POSSIBLE="false"
   fi
 

@@ -616,19 +616,19 @@
 [
   AC_ARG_ENABLE([cds-archive], [AS_HELP_STRING([--disable-cds-archive],
       [Set to disable generation of a default CDS archive in the product image @<:@enabled@:>@])])
 
   AC_MSG_CHECKING([if a default CDS archive should be generated])
-  if test "x$COMPILE_TYPE" = "xcross"; then
+  if test "x$ENABLE_CDS" = "xfalse"; then
+    AC_MSG_RESULT([no, because CDS is disabled])
+    BUILD_CDS_ARCHIVE="false"
+  elif test "x$COMPILE_TYPE" = "xcross"; then
     AC_MSG_RESULT([no, not possible with cross compilation])
     BUILD_CDS_ARCHIVE="false"
   elif test "x$enable_cds_archive" = "xyes"; then
     AC_MSG_RESULT([yes, forced])
     BUILD_CDS_ARCHIVE="true"
-  elif HOTSPOT_CHECK_JVM_VARIANT(zero); then
-    AC_MSG_RESULT([no])
-    BUILD_CDS_ARCHIVE="false"
   elif test "x$enable_cds_archive" = "x"; then
     AC_MSG_RESULT([yes])
     BUILD_CDS_ARCHIVE="true"
   elif test "x$enable_cds_archive" = "xno"; then
     AC_MSG_RESULT([no, forced])