1.1 --- a/common/autoconf/boot-jdk.m4 Mon Oct 12 16:31:23 2015 +0100
1.2 +++ b/common/autoconf/boot-jdk.m4 Wed Oct 21 11:14:06 2015 +0200
1.3 @@ -289,6 +289,16 @@
1.4 BOOT_JDK_SOURCETARGET="-source 7 -target 7"
1.5 AC_SUBST(BOOT_JDK_SOURCETARGET)
1.6 AC_SUBST(JAVAC_FLAGS)
1.7 +
1.8 + # Check if the boot jdk is 32 or 64 bit
1.9 + if "$JAVA" -d64 -version > /dev/null 2>&1; then
1.10 + BOOT_JDK_BITS="64"
1.11 + else
1.12 + BOOT_JDK_BITS="32"
1.13 + fi
1.14 + AC_MSG_CHECKING([if Boot JDK is 32 or 64 bits])
1.15 + AC_MSG_RESULT([$BOOT_JDK_BITS])
1.16 + AC_SUBST(BOOT_JDK_BITS)
1.17 ])
1.18
1.19 AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
1.20 @@ -323,7 +333,7 @@
1.21
1.22 # Maximum amount of heap memory.
1.23 # Maximum stack size.
1.24 - if test "x$BUILD_NUM_BITS" = x32; then
1.25 + if test "x$BOOT_JDK_BITS" = x32; then
1.26 JVM_MAX_HEAP=1100M
1.27 STACK_SIZE=768
1.28 else
