common/autoconf/generated-configure.sh

changeset 1580
f398f28e3112
parent 1494
1e21e4f51701
child 1586
86fa734a1c14
     1.1 --- a/common/autoconf/generated-configure.sh	Mon Oct 12 16:31:23 2015 +0100
     1.2 +++ b/common/autoconf/generated-configure.sh	Wed Oct 21 11:14:06 2015 +0200
     1.3 @@ -792,6 +792,7 @@
     1.4  JAVA_FLAGS_SMALL
     1.5  JAVA_FLAGS_BIG
     1.6  JAVA_FLAGS
     1.7 +BOOT_JDK_BITS
     1.8  JAVAC_FLAGS
     1.9  BOOT_JDK_SOURCETARGET
    1.10  BOOT_JDK
    1.11 @@ -3879,7 +3880,7 @@
    1.12  #CUSTOM_AUTOCONF_INCLUDE
    1.13  
    1.14  # Do not change or remove the following line, it is needed for consistency checks:
    1.15 -DATE_WHEN_GENERATED=1444076935
    1.16 +DATE_WHEN_GENERATED=1445418840
    1.17  
    1.18  ###############################################################################
    1.19  #
    1.20 @@ -16071,6 +16072,18 @@
    1.21  
    1.22  
    1.23  
    1.24 +  # Check if the boot jdk is 32 or 64 bit
    1.25 +  if "$JAVA" -d64 -version > /dev/null 2>&1; then
    1.26 +    BOOT_JDK_BITS="64"
    1.27 +  else
    1.28 +    BOOT_JDK_BITS="32"
    1.29 +  fi
    1.30 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Boot JDK is 32 or 64 bits" >&5
    1.31 +$as_echo_n "checking if Boot JDK is 32 or 64 bits... " >&6; }
    1.32 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BOOT_JDK_BITS" >&5
    1.33 +$as_echo "$BOOT_JDK_BITS" >&6; }
    1.34 +
    1.35 +
    1.36  
    1.37    ##############################################################################
    1.38    #
    1.39 @@ -16150,7 +16163,7 @@
    1.40  
    1.41    # Maximum amount of heap memory.
    1.42    # Maximum stack size.
    1.43 -  if test "x$BUILD_NUM_BITS" = x32; then
    1.44 +  if test "x$BOOT_JDK_BITS" = x32; then
    1.45      JVM_MAX_HEAP=1100M
    1.46      STACK_SIZE=768
    1.47    else

mercurial