common/autoconf/boot-jdk.m4
author adlertz
Fri, 24 Jan 2014 13:06:52 +0100
changeset 22804 401135897b65
parent 20363 fa7663fc5d50
child 22467 b16a5ae55d50
child 22177 c1a48c7b5b2b
permissions -rw-r--r--
8031498: Cleanup and re-factorize PhaseChaitin::build_ifg_physical Summary: Created sub-functions, added data structures, improved naming and removed unnecessary code Reviewed-by: kvn, roland, rbackman
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     1
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     2
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     3
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     4
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     5
# This code is free software; you can redistribute it and/or modify it
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     6
# under the terms of the GNU General Public License version 2 only, as
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     7
# published by the Free Software Foundation.  Oracle designates this
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     8
# particular file as subject to the "Classpath" exception as provided
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
     9
# by Oracle in the LICENSE file that accompanied this code.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    10
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    11
# This code is distributed in the hope that it will be useful, but WITHOUT
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    12
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    13
# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    14
# version 2 for more details (a copy is included in the LICENSE file that
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    15
# accompanied this code).
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    16
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    17
# You should have received a copy of the GNU General Public License version
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    18
# 2 along with this work; if not, write to the Free Software Foundation,
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    19
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    20
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    21
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    22
# or visit www.oracle.com if you need additional information or have any
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    23
# questions.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    24
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    25
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    26
# Execute the check given as argument, and verify the result
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    27
# If the Boot JDK was previously found, do nothing
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    28
# $1 A command line (typically autoconf macro) to execute
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    29
AC_DEFUN([BOOTJDK_DO_CHECK],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    30
[
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    31
  if test "x$BOOT_JDK_FOUND" = xno; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    32
    # Now execute the test
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    33
    $1
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    34
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    35
    # If previous step claimed to have found a JDK, check it to see if it seems to be valid.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    36
    if test "x$BOOT_JDK_FOUND" = xmaybe; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    37
      # Do we have a bin/java?
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    38
      if test ! -x "$BOOT_JDK/bin/java"; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    39
        AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/java; ignoring])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    40
        BOOT_JDK_FOUND=no
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    41
      else
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    42
        # Do we have a bin/javac?
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    43
        if test ! -x "$BOOT_JDK/bin/javac"; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    44
          AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain bin/javac; ignoring])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    45
          AC_MSG_NOTICE([(This might be an JRE instead of an JDK)])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    46
          BOOT_JDK_FOUND=no
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
    47
        else
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    48
          # Do we have an rt.jar? (On MacOSX it is called classes.jar)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    49
          if test ! -f "$BOOT_JDK/jre/lib/rt.jar" && test ! -f "$BOOT_JDK/../Classes/classes.jar"; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    50
            AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK did not contain an rt.jar; ignoring])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    51
            BOOT_JDK_FOUND=no
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    52
          else
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    53
            # Oh, this is looking good! We probably have found a proper JDK. Is it the correct version?
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    54
            BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | head -n 1`
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    55
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    56
            # Extra M4 quote needed to protect [] in grep expression.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    57
            [FOUND_VERSION_78=`echo $BOOT_JDK_VERSION | grep  '\"1\.[78]\.'`]
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    58
            if test "x$FOUND_VERSION_78" = x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    59
              AC_MSG_NOTICE([Potential Boot JDK found at $BOOT_JDK is incorrect JDK version ($BOOT_JDK_VERSION); ignoring])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    60
              AC_MSG_NOTICE([(Your Boot JDK must be version 7 or 8)])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    61
              BOOT_JDK_FOUND=no
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    62
            else
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    63
              # We're done! :-)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    64
              BOOT_JDK_FOUND=yes
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    65
              BASIC_FIXUP_PATH(BOOT_JDK)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    66
              AC_MSG_CHECKING([for Boot JDK])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    67
              AC_MSG_RESULT([$BOOT_JDK])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    68
              AC_MSG_CHECKING([Boot JDK version])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    69
              BOOT_JDK_VERSION=`"$BOOT_JDK/bin/java" -version 2>&1 | $TR '\n\r' '  '`
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    70
              AC_MSG_RESULT([$BOOT_JDK_VERSION])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    71
            fi # end check jdk version
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    72
          fi # end check rt.jar
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    73
        fi # end check javac
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    74
      fi # end check java
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    75
    fi # end check boot jdk found
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    76
  fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    77
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    78
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    79
# Test: Is bootjdk explicitely set by command line arguments?
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    80
AC_DEFUN([BOOTJDK_CHECK_ARGUMENTS],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    81
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
    82
  if test "x$with_boot_jdk" != x; then
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    83
    BOOT_JDK=$with_boot_jdk
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    84
    BOOT_JDK_FOUND=maybe
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    85
    AC_MSG_NOTICE([Found potential Boot JDK using configure arguments])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
    86
  fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    87
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    88
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    89
# Test: Is bootjdk available from builddeps?
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    90
AC_DEFUN([BOOTJDK_CHECK_BUILDDEPS],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    91
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
    92
  BDEPS_CHECK_MODULE(BOOT_JDK, bootjdk, xxx, [BOOT_JDK_FOUND=maybe], [BOOT_JDK_FOUND=no])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    93
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    94
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    95
# Test: Is $JAVA_HOME set?
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    96
AC_DEFUN([BOOTJDK_CHECK_JAVA_HOME],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
    97
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
    98
  if test "x$JAVA_HOME" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
    99
    JAVA_HOME_PROCESSED="$JAVA_HOME"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   100
    BASIC_FIXUP_PATH(JAVA_HOME_PROCESSED)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   101
    if test ! -d "$JAVA_HOME_PROCESSED"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   102
      AC_MSG_NOTICE([Your JAVA_HOME points to a non-existing directory!])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   103
    else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   104
      # Aha, the user has set a JAVA_HOME
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   105
      # let us use that as the Boot JDK.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   106
      BOOT_JDK="$JAVA_HOME_PROCESSED"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   107
      BOOT_JDK_FOUND=maybe
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   108
      AC_MSG_NOTICE([Found potential Boot JDK using JAVA_HOME])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   109
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   110
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   111
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   112
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   113
# Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   114
AC_DEFUN([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   115
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   116
  AC_PATH_PROG(JAVAC_CHECK, javac)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   117
  AC_PATH_PROG(JAVA_CHECK, java)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   118
  BINARY="$JAVAC_CHECK"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   119
  if test "x$JAVAC_CHECK" = x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   120
    BINARY="$JAVA_CHECK"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   121
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   122
  if test "x$BINARY" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   123
    # So there is a java(c) binary, it might be part of a JDK.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   124
    # Lets find the JDK/JRE directory by following symbolic links.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   125
    # Linux/GNU systems often have links from /usr/bin/java to
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   126
    # /etc/alternatives/java to the real JDK binary.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   127
    BASIC_REMOVE_SYMBOLIC_LINKS(BINARY)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   128
    BOOT_JDK=`dirname "$BINARY"`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   129
    BOOT_JDK=`cd "$BOOT_JDK/.."; pwd`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   130
    if test -x "$BOOT_JDK/bin/javac" && test -x "$BOOT_JDK/bin/java"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   131
      # Looks like we found ourselves an JDK
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   132
      BOOT_JDK_FOUND=maybe
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   133
      AC_MSG_NOTICE([Found potential Boot JDK using java(c) in PATH])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   134
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   135
  fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   136
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   137
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   138
# Test: Is there a /usr/libexec/java_home? (Typically on MacOSX)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   139
AC_DEFUN([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   140
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   141
  if test -x /usr/libexec/java_home; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   142
    BOOT_JDK=`/usr/libexec/java_home`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   143
    BOOT_JDK_FOUND=maybe
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   144
    AC_MSG_NOTICE([Found potential Boot JDK using /usr/libexec/java_home])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   145
  fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   146
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   147
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   148
# Look for a jdk in the given path. If there are multiple, try to select the newest.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   149
# If found, set BOOT_JDK and BOOT_JDK_FOUND.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   150
# $1 = Path to directory containing jdk installations.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   151
# $2 = String to append to the found JDK directory to get the proper JDK home
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   152
AC_DEFUN([BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   153
[
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   154
  BOOT_JDK_PREFIX="$1"
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   155
  BOOT_JDK_SUFFIX="$2"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   156
  ALL_JDKS_FOUND=`$LS "$BOOT_JDK_PREFIX" 2> /dev/null | $SORT -r`
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   157
  if test "x$ALL_JDKS_FOUND" != x; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   158
    for JDK_TO_TRY in $ALL_JDKS_FOUND ; do
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   159
      BOOTJDK_DO_CHECK([
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   160
        BOOT_JDK="${BOOT_JDK_PREFIX}/${JDK_TO_TRY}${BOOT_JDK_SUFFIX}"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   161
        if test -d "$BOOT_JDK"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   162
          BOOT_JDK_FOUND=maybe
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   163
          AC_MSG_NOTICE([Found potential Boot JDK using well-known locations (in $BOOT_JDK_PREFIX/$JDK_TO_TRY)])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   164
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   165
      ])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   166
    done
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   167
  fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   168
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   169
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   170
# Call BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY, but use the given
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   171
# environmental variable as base for where to look.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   172
# $1 Name of an environmal variable, assumed to point to the Program Files directory.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   173
AC_DEFUN([BOOTJDK_FIND_BEST_JDK_IN_WINDOWS_VIRTUAL_DIRECTORY],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   174
[
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   175
  if test "x[$]$1" != x; then
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   176
    VIRTUAL_DIR="[$]$1/Java"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   177
    BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(VIRTUAL_DIR)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   178
    BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY($VIRTUAL_DIR)
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   179
  fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   180
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   181
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   182
# Test: Is there a JDK installed in default, well-known locations?
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   183
AC_DEFUN([BOOTJDK_CHECK_WELL_KNOWN_LOCATIONS],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   184
[
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   185
  if test "x$OPENJDK_TARGET_OS" = xwindows; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   186
    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_WINDOWS_VIRTUAL_DIRECTORY([ProgramW6432])])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   187
    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_WINDOWS_VIRTUAL_DIRECTORY([PROGRAMW6432])])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   188
    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_WINDOWS_VIRTUAL_DIRECTORY([PROGRAMFILES])])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   189
    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_WINDOWS_VIRTUAL_DIRECTORY([ProgramFiles])])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   190
    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY([/cygdrive/c/Program Files/Java])])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   191
  elif test "x$OPENJDK_TARGET_OS" = xmacosx; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   192
    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY([/Library/Java/JavaVirtualMachines],[/Contents/Home])])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   193
    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY([/System/Library/Java/JavaVirtualMachines],[/Contents/Home])])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   194
  elif test "x$OPENJDK_TARGET_OS" = xlinux; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   195
    BOOTJDK_DO_CHECK([BOOTJDK_FIND_BEST_JDK_IN_DIRECTORY([/usr/lib/jvm])])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   196
  fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   197
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   198
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   199
# Check that a command-line tool in the Boot JDK is correct
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   200
# $1 = name of variable to assign
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   201
# $2 = name of binary
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   202
AC_DEFUN([BOOTJDK_CHECK_TOOL_IN_BOOTJDK],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   203
[
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   204
  AC_MSG_CHECKING([for $2 in Boot JDK])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   205
  $1=$BOOT_JDK/bin/$2
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   206
  if test ! -x [$]$1; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   207
    AC_MSG_RESULT(not found)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   208
    AC_MSG_NOTICE([Your Boot JDK seems broken. This might be fixed by explicitely setting --with-boot-jdk])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   209
    AC_MSG_ERROR([Could not find $2 in the Boot JDK])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   210
  fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   211
  AC_MSG_RESULT(ok)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   212
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   213
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   214
###############################################################################
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   215
#
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   216
# We need a Boot JDK to bootstrap the build.
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   217
#
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   218
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   219
AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   220
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   221
  BOOT_JDK_FOUND=no
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   222
  AC_ARG_WITH(boot-jdk, [AS_HELP_STRING([--with-boot-jdk],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   223
      [path to Boot JDK (used to bootstrap build) @<:@probed@:>@])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   224
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   225
  # We look for the Boot JDK through various means, going from more certain to
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   226
  # more of a guess-work. After each test, BOOT_JDK_FOUND is set to "yes" if
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   227
  # we detected something (if so, the path to the jdk is in BOOT_JDK). But we
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   228
  # must check if this is indeed valid; otherwise we'll continue looking.
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   229
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   230
  # Test: Is bootjdk explicitely set by command line arguments?
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   231
  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_ARGUMENTS])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   232
  if test "x$with_boot_jdk" != x && test "x$BOOT_JDK_FOUND" = xno; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   233
    # Having specified an argument which is incorrect will produce an instant failure;
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   234
    # we should not go on looking
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   235
    AC_MSG_ERROR([The path given by --with-boot-jdk does not contain a valid Boot JDK])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   236
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   237
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   238
  # Test: Is bootjdk available from builddeps?
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   239
  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_BUILDDEPS])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   240
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   241
  # Test: Is $JAVA_HOME set?
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   242
  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_HOME])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   243
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   244
  # Test: Is there a /usr/libexec/java_home? (Typically on MacOSX)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   245
  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_LIBEXEC_JAVA_HOME])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   246
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   247
  # Test: Is there a java or javac in the PATH, which is a symlink to the JDK?
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   248
  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_JAVA_IN_PATH_IS_SYMLINK])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   249
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   250
  # Test: Is there a JDK installed in default, well-known locations?
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   251
  BOOTJDK_DO_CHECK([BOOTJDK_CHECK_WELL_KNOWN_LOCATIONS])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   252
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   253
  # If we haven't found anything yet, we've truly lost. Give up.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   254
  if test "x$BOOT_JDK_FOUND" = xno; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   255
    HELP_MSG_MISSING_DEPENDENCY([openjdk])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   256
    AC_MSG_NOTICE([Could not find a valid Boot JDK. $HELP_MSG])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   257
    AC_MSG_NOTICE([This might be fixed by explicitely setting --with-boot-jdk])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   258
    AC_MSG_ERROR([Cannot continue])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   259
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   260
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   261
  # Setup proper paths for what we found
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   262
  BOOT_RTJAR="$BOOT_JDK/jre/lib/rt.jar"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   263
  if test ! -f "$BOOT_RTJAR"; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   264
    # On MacOSX it is called classes.jar
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   265
    BOOT_RTJAR="$BOOT_JDK/../Classes/classes.jar"
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   266
    if test -f "$BOOT_RTJAR"; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   267
      # Remove the ..
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   268
      BOOT_RTJAR="`cd ${BOOT_RTJAR%/*} && pwd`/${BOOT_RTJAR##*/}"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   269
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   270
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   271
  BOOT_TOOLSJAR="$BOOT_JDK/lib/tools.jar"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   272
  BOOT_JDK="$BOOT_JDK"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   273
  AC_SUBST(BOOT_RTJAR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   274
  AC_SUBST(BOOT_TOOLSJAR)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   275
  AC_SUBST(BOOT_JDK)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   276
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   277
  # Setup tools from the Boot JDK.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   278
  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVA,java)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   279
  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAC,javac)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   280
  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAH,javah)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   281
  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAVAP,javap)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   282
  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(JAR,jar)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   283
  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(RMIC,rmic)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   284
  BOOTJDK_CHECK_TOOL_IN_BOOTJDK(NATIVE2ASCII,native2ascii)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   285
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   286
  # Finally, set some other options...
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   287
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   288
  # When compiling code to be executed by the Boot JDK, force jdk7 compatibility.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   289
  BOOT_JDK_SOURCETARGET="-source 7 -target 7"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   290
  AC_SUBST(BOOT_JDK_SOURCETARGET)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   291
  AC_SUBST(JAVAC_FLAGS)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   292
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   293
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   294
AC_DEFUN_ONCE([BOOTJDK_SETUP_BOOT_JDK_ARGUMENTS],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   295
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   296
  ##############################################################################
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   297
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   298
  # Specify options for anything that is run with the Boot JDK.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   299
  #
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   300
  AC_ARG_WITH(boot-jdk-jvmargs, [AS_HELP_STRING([--with-boot-jdk-jvmargs],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   301
  [specify JVM arguments to be passed to all invocations of the Boot JDK, overriding the default values,
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   302
  e.g --with-boot-jdk-jvmargs="-Xmx8G -enableassertions"])])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   303
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   304
  if test "x$with_boot_jdk_jvmargs" = x; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   305
    # Not all JVM:s accept the same arguments on the command line.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   306
    # OpenJDK specific increase in thread stack for JDK build,
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   307
    # well more specifically, when running javac.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   308
    if test "x$BUILD_NUM_BITS" = x32; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   309
      STACK_SIZE=768
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   310
    else
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   311
      # Running Javac on a JVM on a 64-bit machine, the stack takes more space
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   312
      # since 64-bit pointers are pushed on the stach. Apparently, we need
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   313
      # to increase the stack space when javacing the JDK....
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   314
      STACK_SIZE=1536
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   315
    fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   316
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   317
    # Minimum amount of heap memory.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   318
    ADD_JVM_ARG_IF_OK([-Xms64M],boot_jdk_jvmargs,[$JAVA])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   319
    if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   320
      # Why does macosx need more heap? Its the huge JDK batch.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   321
      ADD_JVM_ARG_IF_OK([-Xmx1600M],boot_jdk_jvmargs,[$JAVA])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   322
    else
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   323
      ADD_JVM_ARG_IF_OK([-Xmx1100M],boot_jdk_jvmargs,[$JAVA])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   324
    fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   325
    # When is adding -client something that speeds up the JVM?
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   326
    # ADD_JVM_ARG_IF_OK([-client],boot_jdk_jvmargs,[$JAVA])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   327
    ADD_JVM_ARG_IF_OK([-XX:PermSize=32m],boot_jdk_jvmargs,[$JAVA])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   328
    ADD_JVM_ARG_IF_OK([-XX:MaxPermSize=160m],boot_jdk_jvmargs,[$JAVA])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   329
    ADD_JVM_ARG_IF_OK([-XX:ThreadStackSize=$STACK_SIZE],boot_jdk_jvmargs,[$JAVA])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   330
    # Disable special log output when a debug build is used as Boot JDK...
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   331
    ADD_JVM_ARG_IF_OK([-XX:-PrintVMOptions -XX:-UnlockDiagnosticVMOptions -XX:-LogVMOutput],boot_jdk_jvmargs,[$JAVA])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   332
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   333
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 14111
diff changeset
   334
  AC_SUBST(BOOT_JDK_JVMARGS, $boot_jdk_jvmargs)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   335
])