From 0c818eb24297326bcd671f55fb98988ad90c3b2c Mon Sep 17 00:00:00 2001 From: "Keith W. Campbell" Date: Tue, 9 Apr 2024 12:57:55 -0400 Subject: [PATCH] Support explicit use of '--enable-jitserver' on all supported platforms Signed-off-by: Keith W. Campbell --- closed/autoconf/custom-hook.m4 | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/closed/autoconf/custom-hook.m4 b/closed/autoconf/custom-hook.m4 index ac01b06464..21743dba2f 100644 --- a/closed/autoconf/custom-hook.m4 +++ b/closed/autoconf/custom-hook.m4 @@ -365,10 +365,19 @@ AC_DEFUN([OPENJ9_CONFIGURE_JITSERVER], [ AC_ARG_ENABLE([jitserver], [AS_HELP_STRING([--enable-jitserver], [enable JITServer support @<:@disabled@:>@])]) + case "$OPENJ9_PLATFORM_CODE" in + xa64|xl64|xr64|xz64) + jitserver_supported=yes + ;; + *) + jitserver_supported=no + ;; + esac + AC_MSG_CHECKING([for jitserver]) OPENJ9_ENABLE_JITSERVER=false if test "x$enable_jitserver" = xyes ; then - if test "x$OPENJDK_TARGET_OS" = xlinux ; then + if test "x$jitserver_supported" = xyes ; then AC_MSG_RESULT([yes (explicitly enabled)]) OPENJ9_ENABLE_JITSERVER=true else @@ -378,15 +387,10 @@ AC_DEFUN([OPENJ9_CONFIGURE_JITSERVER], elif test "x$enable_jitserver" = xno ; then AC_MSG_RESULT([no (explicitly disabled)]) elif test "x$enable_jitserver" = x ; then - case "$OPENJ9_PLATFORM_CODE" in - xa64|xl64|xr64|xz64) - AC_MSG_RESULT([yes (default)]) - OPENJ9_ENABLE_JITSERVER=true - ;; - *) - AC_MSG_RESULT([no (default)]) - ;; - esac + if test "x$jitserver_supported" = xyes ; then + OPENJ9_ENABLE_JITSERVER=true + fi + AC_MSG_RESULT([$jitserver_supported (default)]) else AC_MSG_ERROR([--enable-jitserver accepts no argument]) fi