stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8171859: Configure check for modular boot jdk needs to be updated

Browse Source 
Reviewed-by: mchung
This commit is contained in:
Erik Joelsson 2016-12-27 09:42:16 +01:00
parent 9fd7d77410
commit d6019ba534
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/autoconf/boot-jdk.m4
View File

@ -305,9 +305,8 @@ AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
BOOT_JDK_SOURCETARGET="-source 8 -target 8"
AC_SUBST(BOOT_JDK_SOURCETARGET)
ADD_JVM_ARG_IF_OK([--patch-module foo=bar], dummy, [$JAVA])
AC_MSG_CHECKING([if Boot JDK supports modules])
if test "x$JVM_ARG_OK" = "xtrue"; then
if "$JAVA" --list-modules > /dev/null 2>&1; then
AC_MSG_RESULT([yes])
BOOT_JDK_MODULAR="true"
else

19
common/autoconf/generated-configure.sh
View File

@ -5170,7 +5170,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1482309967
DATE_WHEN_GENERATED=1482828098
###############################################################################
#
@ -30665,24 +30665,9 @@ $as_echo "$tool_specified" >&6; }
BOOT_JDK_SOURCETARGET="-source 8 -target 8"
$ECHO "Check if jvm arg is ok: --patch-module foo=bar" >&5
$ECHO "Command: $JAVA --patch-module foo=bar -version" >&5
OUTPUT=`$JAVA --patch-module foo=bar -version 2>&1`
FOUND_WARN=`$ECHO "$OUTPUT" | $GREP -i warn`
FOUND_VERSION=`$ECHO $OUTPUT | $GREP " version \""`
if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
dummy="$dummy --patch-module foo=bar"
JVM_ARG_OK=true
else
$ECHO "Arg failed:" >&5
$ECHO "$OUTPUT" >&5
JVM_ARG_OK=false
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Boot JDK supports modules" >&5
$as_echo_n "checking if Boot JDK supports modules... " >&6; }
if test "x$JVM_ARG_OK" = "xtrue"; then
if "$JAVA" --list-modules > /dev/null 2>&1; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
BOOT_JDK_MODULAR="true"