< prev index next >

make/autoconf/jdk-options.m4

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


 510   else
 511     AC_MSG_ERROR([Invalid value for --enable-jtreg-failure-handler: $enable_jtreg_failure_handler])
 512   fi
 513 
 514   AC_SUBST(BUILD_FAILURE_HANDLER)
 515 ])
 516 
 517 ################################################################################
 518 #
 519 # Enable or disable generation of the classlist at build time
 520 #
 521 AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST],
 522 [
 523   AC_ARG_ENABLE([generate-classlist], [AS_HELP_STRING([--disable-generate-classlist],
 524       [forces enabling or disabling of the generation of a CDS classlist at build time.
 525       Default is to generate it when either the server or client JVMs are built and
 526       enable-cds is true.])])
 527 
 528   # Check if it's likely that it's possible to generate the classlist. Depending
 529   # on exact jvm configuration it could be possible anyway.
 530   if test "x$ENABLE_CDS" = "xtrue" && (HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client)); then
 531     ENABLE_GENERATE_CLASSLIST_POSSIBLE="true"
 532   else
 533     ENABLE_GENERATE_CLASSLIST_POSSIBLE="false"
 534   fi
 535 
 536   AC_MSG_CHECKING([if the CDS classlist generation should be enabled])
 537   if test "x$enable_generate_classlist" = "xyes"; then
 538     AC_MSG_RESULT([yes, forced])
 539     ENABLE_GENERATE_CLASSLIST="true"
 540     if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xfalse"; then
 541       AC_MSG_WARN([Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS and enable-cds=$ENABLE_CDS])
 542     fi
 543   elif test "x$enable_generate_classlist" = "xno"; then
 544     AC_MSG_RESULT([no, forced])
 545     ENABLE_GENERATE_CLASSLIST="false"
 546   elif test "x$enable_generate_classlist" = "x"; then
 547     if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xtrue"; then
 548       AC_MSG_RESULT([yes])
 549       ENABLE_GENERATE_CLASSLIST="true"
 550     else


 601   else
 602     AC_MSG_RESULT([no])
 603     AC_MSG_ERROR([--enable-manpages can only yes/no or empty])
 604   fi
 605 
 606   AC_SUBST(BUILD_MANPAGES)
 607 ])
 608 
 609 ################################################################################
 610 #
 611 # Disable the default CDS archive generation
 612 #   cross compilation - disabled
 613 #   zero              - off by default (not a tested configuration)
 614 #
 615 AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE],
 616 [
 617   AC_ARG_ENABLE([cds-archive], [AS_HELP_STRING([--disable-cds-archive],
 618       [Set to disable generation of a default CDS archive in the product image @<:@enabled@:>@])])
 619 
 620   AC_MSG_CHECKING([if a default CDS archive should be generated])
 621   if test "x$COMPILE_TYPE" = "xcross"; then



 622     AC_MSG_RESULT([no, not possible with cross compilation])
 623     BUILD_CDS_ARCHIVE="false"
 624   elif test "x$enable_cds_archive" = "xyes"; then
 625     AC_MSG_RESULT([yes, forced])
 626     BUILD_CDS_ARCHIVE="true"
 627   elif HOTSPOT_CHECK_JVM_VARIANT(zero); then
 628     AC_MSG_RESULT([no])
 629     BUILD_CDS_ARCHIVE="false"
 630   elif test "x$enable_cds_archive" = "x"; then
 631     AC_MSG_RESULT([yes])
 632     BUILD_CDS_ARCHIVE="true"
 633   elif test "x$enable_cds_archive" = "xno"; then
 634     AC_MSG_RESULT([no, forced])
 635     BUILD_CDS_ARCHIVE="false"
 636   else
 637     AC_MSG_RESULT([no])
 638     AC_MSG_ERROR([--enable-cds_archive can only be yes/no or empty])
 639   fi
 640 
 641   AC_SUBST(BUILD_CDS_ARCHIVE)
 642 ])


 510   else
 511     AC_MSG_ERROR([Invalid value for --enable-jtreg-failure-handler: $enable_jtreg_failure_handler])
 512   fi
 513 
 514   AC_SUBST(BUILD_FAILURE_HANDLER)
 515 ])
 516 
 517 ################################################################################
 518 #
 519 # Enable or disable generation of the classlist at build time
 520 #
 521 AC_DEFUN_ONCE([JDKOPT_ENABLE_DISABLE_GENERATE_CLASSLIST],
 522 [
 523   AC_ARG_ENABLE([generate-classlist], [AS_HELP_STRING([--disable-generate-classlist],
 524       [forces enabling or disabling of the generation of a CDS classlist at build time.
 525       Default is to generate it when either the server or client JVMs are built and
 526       enable-cds is true.])])
 527 
 528   # Check if it's likely that it's possible to generate the classlist. Depending
 529   # on exact jvm configuration it could be possible anyway.
 530   if test "x$ENABLE_CDS" = "xtrue" && (HOTSPOT_CHECK_JVM_VARIANT(server) || HOTSPOT_CHECK_JVM_VARIANT(client) || HOTSPOT_CHECK_JVM_FEATURE(cds)); then
 531     ENABLE_GENERATE_CLASSLIST_POSSIBLE="true"
 532   else
 533     ENABLE_GENERATE_CLASSLIST_POSSIBLE="false"
 534   fi
 535 
 536   AC_MSG_CHECKING([if the CDS classlist generation should be enabled])
 537   if test "x$enable_generate_classlist" = "xyes"; then
 538     AC_MSG_RESULT([yes, forced])
 539     ENABLE_GENERATE_CLASSLIST="true"
 540     if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xfalse"; then
 541       AC_MSG_WARN([Generation of classlist might not be possible with JVM Variants $JVM_VARIANTS and enable-cds=$ENABLE_CDS])
 542     fi
 543   elif test "x$enable_generate_classlist" = "xno"; then
 544     AC_MSG_RESULT([no, forced])
 545     ENABLE_GENERATE_CLASSLIST="false"
 546   elif test "x$enable_generate_classlist" = "x"; then
 547     if test "x$ENABLE_GENERATE_CLASSLIST_POSSIBLE" = "xtrue"; then
 548       AC_MSG_RESULT([yes])
 549       ENABLE_GENERATE_CLASSLIST="true"
 550     else


 601   else
 602     AC_MSG_RESULT([no])
 603     AC_MSG_ERROR([--enable-manpages can only yes/no or empty])
 604   fi
 605 
 606   AC_SUBST(BUILD_MANPAGES)
 607 ])
 608 
 609 ################################################################################
 610 #
 611 # Disable the default CDS archive generation
 612 #   cross compilation - disabled
 613 #   zero              - off by default (not a tested configuration)
 614 #
 615 AC_DEFUN([JDKOPT_ENABLE_DISABLE_CDS_ARCHIVE],
 616 [
 617   AC_ARG_ENABLE([cds-archive], [AS_HELP_STRING([--disable-cds-archive],
 618       [Set to disable generation of a default CDS archive in the product image @<:@enabled@:>@])])
 619 
 620   AC_MSG_CHECKING([if a default CDS archive should be generated])
 621   if test "x$ENABLE_CDS" = "xfalse"; then
 622     AC_MSG_RESULT([no, because CDS is disabled])
 623     BUILD_CDS_ARCHIVE="false"
 624   elif test "x$COMPILE_TYPE" = "xcross"; then
 625     AC_MSG_RESULT([no, not possible with cross compilation])
 626     BUILD_CDS_ARCHIVE="false"
 627   elif test "x$enable_cds_archive" = "xyes"; then
 628     AC_MSG_RESULT([yes, forced])
 629     BUILD_CDS_ARCHIVE="true"



 630   elif test "x$enable_cds_archive" = "x"; then
 631     AC_MSG_RESULT([yes])
 632     BUILD_CDS_ARCHIVE="true"
 633   elif test "x$enable_cds_archive" = "xno"; then
 634     AC_MSG_RESULT([no, forced])
 635     BUILD_CDS_ARCHIVE="false"
 636   else
 637     AC_MSG_RESULT([no])
 638     AC_MSG_ERROR([--enable-cds_archive can only be yes/no or empty])
 639   fi
 640 
 641   AC_SUBST(BUILD_CDS_ARCHIVE)
 642 ])
< prev index next >