1.1 --- a/common/autoconf/jdk-options.m4 Mon Feb 17 18:08:03 2020 +0100
1.2 +++ b/common/autoconf/jdk-options.m4 Mon Feb 24 20:09:00 2020 +0300
1.3 @@ -442,11 +442,19 @@
1.4 AC_MSG_CHECKING([whether to build jfr])
1.5 AC_ARG_ENABLE(jfr, [AS_HELP_STRING([--disable-jfr],
1.6 [Disable Java Flight Recorder support @<:@enabled@:>@])],,
1.7 - [enable_jfr=yes])
1.8 + [enable_jfr=auto])
1.9 if test "x$enable_jfr" = "xno"; then
1.10 ENABLE_JFR=false
1.11 - elif test "x$enable_jfr" = "xyes"; then
1.12 - ENABLE_JFR=true
1.13 + elif test "x$enable_jfr" = "xyes" -o "x$enable_jfr" = "xauto"; then
1.14 + if test "x$JVM_VARIANT_MINIMAL1" = "xtrue" -o "x$JVM_VARIANT_ZERO" = "xtrue"; then
1.15 + if test "x$enable_jfr" = "xyes"; then
1.16 + AC_MSG_ERROR([cannot enable JFR on minimal1 VM or zero build])
1.17 + else
1.18 + ENABLE_JFR=false
1.19 + fi
1.20 + else
1.21 + ENABLE_JFR=true
1.22 + fi
1.23 else
1.24 AC_MSG_ERROR([--enable-jfr must either be set to yes or no])
1.25 fi
