make/autoconf/jdk-options.m4

*** 616,626 ****
  [
    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
      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"
--- 616,629 ----
  [
    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$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"