--- old/make/autoconf/jdk-options.m4	2018-10-08 10:15:58.649507501 +0200
+++ new/make/autoconf/jdk-options.m4	2018-10-08 10:15:58.261510310 +0200
@@ -618,7 +618,10 @@
       [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