equal
deleted
inserted
replaced
333 if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then |
333 if test "x$JVM_FEATURES_jvmci" != "xjvmci" ; then |
334 AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci']) |
334 AC_MSG_ERROR([Specified JVM feature 'graal' requires feature 'jvmci']) |
335 fi |
335 fi |
336 INCLUDE_GRAAL="true" |
336 INCLUDE_GRAAL="true" |
337 else |
337 else |
338 # By default enable graal build where AOT is available |
338 # By default enable graal build on linux-x64 or where AOT is available. |
339 if test "x$ENABLE_AOT" = "xtrue"; then |
339 # graal build requires jvmci. |
|
340 if test "x$JVM_FEATURES_jvmci" = "xjvmci" && \ |
|
341 (test "x$OPENJDK_TARGET_CPU" = "xx86_64" && \ |
|
342 test "x$OPENJDK_TARGET_OS" = "xlinux" || \ |
|
343 test "x$ENABLE_AOT" = "xtrue") ; then |
340 AC_MSG_RESULT([yes]) |
344 AC_MSG_RESULT([yes]) |
341 JVM_FEATURES_graal="graal" |
345 JVM_FEATURES_graal="graal" |
342 INCLUDE_GRAAL="true" |
346 INCLUDE_GRAAL="true" |
343 else |
347 else |
344 AC_MSG_RESULT([no]) |
348 AC_MSG_RESULT([no]) |