common/autoconf/basics.m4
author dfuchs
Wed, 04 Feb 2015 17:12:03 +0100
changeset 28744 4283637ac96e
parent 28602 51c0dcf51b67
child 28809 6481e27e00ee
child 28906 741a25ba3b20
permissions -rw-r--r--
8072450: 9-dev build failed on elinux-i586 and rlinux-i586 Summary: added LL suffix to constant declaration Reviewed-by: dholmes, coleenp, sla
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
#
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
     2
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
13133
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
17592
06b7538d17ef 8014514: Fix jvm args for sjavac
erikj
parents: 16580
diff changeset
    26
# Test if $1 is a valid argument to $3 (often is $JAVA passed as $3)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    27
# If so, then append $1 to $2 \
17592
06b7538d17ef 8014514: Fix jvm args for sjavac
erikj
parents: 16580
diff changeset
    28
# Also set JVM_ARG_OK to true/false depending on outcome.
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    29
AC_DEFUN([ADD_JVM_ARG_IF_OK],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    30
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    31
  $ECHO "Check if jvm arg is ok: $1" >&AS_MESSAGE_LOG_FD
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    32
  $ECHO "Command: $3 $1 -version" >&AS_MESSAGE_LOG_FD
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    33
  OUTPUT=`$3 $1 -version 2>&1`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    34
  FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    35
  FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    36
  if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    37
    $2="[$]$2 $1"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    38
    JVM_ARG_OK=true
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    39
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    40
    $ECHO "Arg failed:" >&AS_MESSAGE_LOG_FD
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    41
    $ECHO "$OUTPUT" >&AS_MESSAGE_LOG_FD
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    42
    JVM_ARG_OK=false
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    43
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    44
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    45
18421
0296625b6c1f 8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents: 18021
diff changeset
    46
# Appends a string to a path variable, only adding the : when needed.
0296625b6c1f 8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents: 18021
diff changeset
    47
AC_DEFUN([BASIC_APPEND_TO_PATH],
0296625b6c1f 8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents: 18021
diff changeset
    48
[
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    49
  if test "x$2" != x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    50
    if test "x[$]$1" = x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    51
      $1="$2"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    52
    else
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    53
      $1="[$]$1:$2"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    54
    fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    55
  fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    56
])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    57
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    58
# Prepends a string to a path variable, only adding the : when needed.
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    59
AC_DEFUN([BASIC_PREPEND_TO_PATH],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    60
[
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    61
  if test "x$2" != x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    62
    if test "x[$]$1" = x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    63
      $1="$2"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    64
    else
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    65
      $1="$2:[$]$1"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
    66
    fi
18421
0296625b6c1f 8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents: 18021
diff changeset
    67
  fi
0296625b6c1f 8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents: 18021
diff changeset
    68
])
0296625b6c1f 8017047: Can't use --with-java-devtools and --with-devkit at the same time
erikj
parents: 18021
diff changeset
    69
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    70
# This will make sure the given variable points to a full and proper
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    71
# path. This means:
27586
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 27329
diff changeset
    72
# 1) There will be no spaces in the path. On unix platforms,
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    73
#    spaces in the path will result in an error. On Windows,
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    74
#    the path will be rewritten using short-style to be space-free.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    75
# 2) The path will be absolute, and it will be in unix-style (on
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    76
#     cygwin).
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    77
# $1: The name of the variable to fix
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    78
AC_DEFUN([BASIC_FIXUP_PATH],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    79
[
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    80
  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    81
    BASIC_FIXUP_PATH_CYGWIN($1)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    82
  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    83
    BASIC_FIXUP_PATH_MSYS($1)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    84
  else
27586
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 27329
diff changeset
    85
    # We're on a unix platform. Hooray! :)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    86
    path="[$]$1"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    87
    has_space=`$ECHO "$path" | $GREP " "`
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    88
    if test "x$has_space" != x; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    89
      AC_MSG_NOTICE([The path of $1, which resolves as "$path", is invalid.])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
    90
      AC_MSG_ERROR([Spaces are not allowed in this path.])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
    91
    fi
17593
de6741d8a142 8007129: build-infra Add configure --with-jtreg option for location of JTREG
erikj
parents: 17592
diff changeset
    92
de6741d8a142 8007129: build-infra Add configure --with-jtreg option for location of JTREG
erikj
parents: 17592
diff changeset
    93
    # Use eval to expand a potential ~
de6741d8a142 8007129: build-infra Add configure --with-jtreg option for location of JTREG
erikj
parents: 17592
diff changeset
    94
    eval path="$path"
de6741d8a142 8007129: build-infra Add configure --with-jtreg option for location of JTREG
erikj
parents: 17592
diff changeset
    95
    if test ! -f "$path" && test ! -d "$path"; then
de6741d8a142 8007129: build-infra Add configure --with-jtreg option for location of JTREG
erikj
parents: 17592
diff changeset
    96
      AC_MSG_ERROR([The path of $1, which resolves as "$path", is not found.])
de6741d8a142 8007129: build-infra Add configure --with-jtreg option for location of JTREG
erikj
parents: 17592
diff changeset
    97
    fi
de6741d8a142 8007129: build-infra Add configure --with-jtreg option for location of JTREG
erikj
parents: 17592
diff changeset
    98
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
    99
    $1="`cd "$path"; $THEPWDCMD -L`"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   100
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   101
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   102
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   103
# This will make sure the given variable points to a executable
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   104
# with a full and proper path. This means:
27586
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 27329
diff changeset
   105
# 1) There will be no spaces in the path. On unix platforms,
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   106
#    spaces in the path will result in an error. On Windows,
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   107
#    the path will be rewritten using short-style to be space-free.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   108
# 2) The path will be absolute, and it will be in unix-style (on
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   109
#     cygwin).
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   110
# Any arguments given to the executable is preserved.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   111
# If the input variable does not have a directory specification, then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   112
# it need to be in the PATH.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   113
# $1: The name of the variable to fix
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   114
AC_DEFUN([BASIC_FIXUP_EXECUTABLE],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   115
[
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   116
  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   117
    BASIC_FIXUP_EXECUTABLE_CYGWIN($1)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   118
  elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   119
    BASIC_FIXUP_EXECUTABLE_MSYS($1)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   120
  else
27586
e7cfdc266a70 8058631: Rename posix to unix in build system to match file name changes
ihse
parents: 27329
diff changeset
   121
    # We're on a unix platform. Hooray! :)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   122
    # First separate the path from the arguments. This will split at the first
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   123
    # space.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   124
    complete="[$]$1"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   125
    path="${complete%% *}"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   126
    tmp="$complete EOL"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   127
    arguments="${tmp#* }"
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   128
14736
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   129
    # Cannot rely on the command "which" here since it doesn't always work.
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   130
    is_absolute_path=`$ECHO "$path" | $GREP ^/`
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   131
    if test -z "$is_absolute_path"; then
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   132
      # Path to executable is not absolute. Find it.
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   133
      IFS_save="$IFS"
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   134
      IFS=:
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   135
      for p in $PATH; do
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   136
        if test -f "$p/$path" && test -x "$p/$path"; then
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   137
          new_path="$p/$path"
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   138
          break
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   139
        fi
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   140
      done
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   141
      IFS="$IFS_save"
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   142
    else
22721
63761da45392 8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents: 22716
diff changeset
   143
      # This is an absolute path, we can use it without further modifications.
14736
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   144
      new_path="$path"
ee810661e3d1 8001901: build-infra: Fix "misbehaving" which command on Solaris
erikj
parents: 14563
diff changeset
   145
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   146
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   147
    if test "x$new_path" = x; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   148
      AC_MSG_NOTICE([The path of $1, which resolves as "$complete", is not found.])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   149
      has_space=`$ECHO "$complete" | $GREP " "`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   150
      if test "x$has_space" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   151
        AC_MSG_NOTICE([This might be caused by spaces in the path, which is not allowed.])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   152
      fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   153
      AC_MSG_ERROR([Cannot locate the the path of $1])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   154
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   155
  fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   156
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   157
  # Now join together the path and the arguments once again
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   158
  if test "x$arguments" != xEOL; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   159
    new_complete="$new_path ${arguments% *}"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   160
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   161
    new_complete="$new_path"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   162
  fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   163
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   164
  if test "x$complete" != "x$new_complete"; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   165
    $1="$new_complete"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   166
    AC_MSG_NOTICE([Rewriting $1 to "$new_complete"])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   167
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   168
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   169
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   170
AC_DEFUN([BASIC_REMOVE_SYMBOLIC_LINKS],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   171
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   172
  if test "x$OPENJDK_BUILD_OS" != xwindows; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   173
    # Follow a chain of symbolic links. Use readlink
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   174
    # where it exists, else fall back to horribly
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   175
    # complicated shell code.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   176
    if test "x$READLINK_TESTED" != yes; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   177
      # On MacOSX there is a readlink tool with a different
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   178
      # purpose than the GNU readlink tool. Check the found readlink.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   179
      ISGNU=`$READLINK --version 2>&1 | $GREP GNU`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   180
      if test "x$ISGNU" = x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   181
        # A readlink that we do not know how to use.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   182
        # Are there other non-GNU readlinks out there?
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   183
        READLINK_TESTED=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   184
        READLINK=
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   185
      fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   186
    fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   187
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   188
    if test "x$READLINK" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   189
      $1=`$READLINK -f [$]$1`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   190
    else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   191
      # Save the current directory for restoring afterwards
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   192
      STARTDIR=$PWD
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   193
      COUNTER=0
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   194
      sym_link_dir=`$DIRNAME [$]$1`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   195
      sym_link_file=`$BASENAME [$]$1`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   196
      cd $sym_link_dir
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   197
      # Use -P flag to resolve symlinks in directories.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   198
      cd `$THEPWDCMD -P`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   199
      sym_link_dir=`$THEPWDCMD -P`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   200
      # Resolve file symlinks
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   201
      while test $COUNTER -lt 20; do
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   202
        ISLINK=`$LS -l $sym_link_dir/$sym_link_file | $GREP '\->' | $SED -e 's/.*-> \(.*\)/\1/'`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   203
        if test "x$ISLINK" == x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   204
          # This is not a symbolic link! We are done!
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   205
          break
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   206
        fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   207
        # Again resolve directory symlinks since the target of the just found
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   208
        # link could be in a different directory
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   209
        cd `$DIRNAME $ISLINK`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   210
        sym_link_dir=`$THEPWDCMD -P`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   211
        sym_link_file=`$BASENAME $ISLINK`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   212
        let COUNTER=COUNTER+1
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   213
      done
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   214
      cd $STARTDIR
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   215
      $1=$sym_link_dir/$sym_link_file
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   216
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   217
  fi
13133
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
19763
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   220
# Register a --with argument but mark it as deprecated
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   221
# $1: The name of the with argument to deprecate, not including --with-
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   222
AC_DEFUN([BASIC_DEPRECATED_ARG_WITH],
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   223
[
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   224
  AC_ARG_WITH($1, [AS_HELP_STRING([--with-$1],
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   225
      [Deprecated. Option is kept for backwards compatibility and is ignored])],
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   226
      [AC_MSG_WARN([Option --with-$1 is deprecated and will be ignored.])])
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   227
])
f234bbfc5ab3 8024815: Make --with-dxsdk and friends deprecated
ihse
parents: 18427
diff changeset
   228
20649
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   229
# Register a --enable argument but mark it as deprecated
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   230
# $1: The name of the with argument to deprecate, not including --enable-
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   231
# $2: The name of the argument to deprecate, in shell variable style (i.e. with _ instead of -)
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   232
AC_DEFUN([BASIC_DEPRECATED_ARG_ENABLE],
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   233
[
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   234
  AC_ARG_ENABLE($1, [AS_HELP_STRING([--enable-$1],
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   235
      [Deprecated. Option is kept for backwards compatibility and is ignored])])
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   236
  if test "x$enable_$2" != x; then
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   237
    AC_MSG_WARN([Option --enable-$1 is deprecated and will be ignored.])
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   238
  fi
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   239
])
47ddc69a25a7 8026864: Deprecate --disable-macosx-runtime-support.
ihse
parents: 20647
diff changeset
   240
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   241
AC_DEFUN_ONCE([BASIC_INIT],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   242
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   243
  # Save the original command line. This is passed to us by the wrapper configure script.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   244
  AC_SUBST(CONFIGURE_COMMAND_LINE)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   245
  DATE_WHEN_CONFIGURED=`LANG=C date`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   246
  AC_SUBST(DATE_WHEN_CONFIGURED)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   247
  AC_MSG_NOTICE([Configuration created at $DATE_WHEN_CONFIGURED.])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   248
  AC_MSG_NOTICE([configure script generated at timestamp $DATE_WHEN_GENERATED.])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   249
])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   250
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   251
# Test that variable $1 denoting a program is not empty. If empty, exit with an error.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   252
# $1: variable to check
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   253
AC_DEFUN([BASIC_CHECK_NONEMPTY],
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   254
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   255
  if test "x[$]$1" = x; then
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   256
    AC_MSG_ERROR([Could not find required tool for $1])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   257
  fi
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   258
])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   259
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   260
# Check that there are no unprocessed overridden variables left.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   261
# If so, they are an incorrect argument and we will exit with an error.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   262
AC_DEFUN([BASIC_CHECK_LEFTOVER_OVERRIDDEN],
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   263
[
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   264
  if test "x$CONFIGURE_OVERRIDDEN_VARIABLES" != x; then
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   265
    # Replace the separating ! with spaces before presenting for end user.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   266
    unknown_variables=${CONFIGURE_OVERRIDDEN_VARIABLES//!/ }
22478
5ca2b792a5fd 8033292: only warn, not fail, on unknown variables in configure
ihse
parents: 22475
diff changeset
   267
    AC_MSG_WARN([The following variables might be unknown to configure: $unknown_variables])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   268
  fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   269
])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   270
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27586
diff changeset
   271
# Setup a tool for the given variable. If correctly specified by the user,
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   272
# use that value, otherwise search for the tool using the supplied code snippet.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   273
# $1: variable to set
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   274
# $2: code snippet to call to look for the tool
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   275
AC_DEFUN([BASIC_SETUP_TOOL],
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   276
[
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   277
  # Publish this variable in the help.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   278
  AC_ARG_VAR($1, [Override default value for $1])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   279
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   280
  if test "x[$]$1" = x; then
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   281
    # The variable is not set by user, try to locate tool using the code snippet
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   282
    $2
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   283
  else
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   284
    # The variable is set, but is it from the command line or the environment?
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   285
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   286
    # Try to remove the string !$1! from our list.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   287
    try_remove_var=${CONFIGURE_OVERRIDDEN_VARIABLES//!$1!/}
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   288
    if test "x$try_remove_var" = "x$CONFIGURE_OVERRIDDEN_VARIABLES"; then
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   289
      # If it failed, the variable was not from the command line. Ignore it,
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   290
      # but warn the user (except for BASH, which is always set by the calling BASH).
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   291
      if test "x$1" != xBASH; then
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   292
        AC_MSG_WARN([Ignoring value of $1 from the environment. Use command line variables instead.])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   293
      fi
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   294
      # Try to locate tool using the code snippet
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   295
      $2
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   296
    else
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   297
      # If it succeeded, then it was overridden by the user. We will use it
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   298
      # for the tool.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   299
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   300
      # First remove it from the list of overridden variables, so we can test
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   301
      # for unknown variables in the end.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   302
      CONFIGURE_OVERRIDDEN_VARIABLES="$try_remove_var"
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   303
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   304
      # Check if the provided tool contains a complete path.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   305
      tool_specified="[$]$1"
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   306
      tool_basename="${tool_specified##*/}"
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   307
      if test "x$tool_basename" = "x$tool_specified"; then
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   308
        # A command without a complete path is provided, search $PATH.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   309
        AC_MSG_NOTICE([Will search for user supplied tool $1=$tool_basename])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   310
        AC_PATH_PROG($1, $tool_basename)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   311
        if test "x[$]$1" = x; then
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   312
          AC_MSG_ERROR([User supplied tool $tool_basename could not be found])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   313
        fi
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   314
      else
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   315
        # Otherwise we believe it is a complete path. Use it as it is.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   316
        AC_MSG_NOTICE([Will use user supplied tool $1=$tool_specified])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   317
        AC_MSG_CHECKING([for $1])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   318
        if test ! -x "$tool_specified"; then
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   319
          AC_MSG_RESULT([not found])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   320
          AC_MSG_ERROR([User supplied tool $1=$tool_specified does not exist or is not executable])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   321
        fi
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   322
        AC_MSG_RESULT([$tool_specified])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   323
      fi
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   324
    fi
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   325
  fi
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   326
])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   327
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   328
# Call BASIC_SETUP_TOOL with AC_PATH_PROGS to locate the tool
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   329
# $1: variable to set
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   330
# $2: executable name (or list of names) to look for
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   331
AC_DEFUN([BASIC_PATH_PROGS],
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   332
[
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   333
  BASIC_SETUP_TOOL($1, [AC_PATH_PROGS($1, $2)])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   334
])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   335
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   336
# Call BASIC_SETUP_TOOL with AC_CHECK_TOOLS to locate the tool
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   337
# $1: variable to set
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   338
# $2: executable name (or list of names) to look for
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   339
AC_DEFUN([BASIC_CHECK_TOOLS],
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   340
[
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   341
  BASIC_SETUP_TOOL($1, [AC_CHECK_TOOLS($1, $2)])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   342
])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   343
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   344
# Like BASIC_PATH_PROGS but fails if no tool was found.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   345
# $1: variable to set
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   346
# $2: executable name (or list of names) to look for
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   347
AC_DEFUN([BASIC_REQUIRE_PROGS],
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   348
[
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   349
  BASIC_PATH_PROGS($1, $2)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   350
  BASIC_CHECK_NONEMPTY($1)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   351
])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   352
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   353
# Like BASIC_SETUP_TOOL but fails if no tool was found.
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   354
# $1: variable to set
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   355
# $2: autoconf macro to call to look for the special tool
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   356
AC_DEFUN([BASIC_REQUIRE_SPECIAL],
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   357
[
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   358
  BASIC_SETUP_TOOL($1, [$2])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   359
  BASIC_CHECK_NONEMPTY($1)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   360
])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   361
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   362
# Setup the most fundamental tools that relies on not much else to set up,
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   363
# but is used by much of the early bootstrap code.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   364
AC_DEFUN_ONCE([BASIC_SETUP_FUNDAMENTAL_TOOLS],
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   365
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   366
  # Start with tools that do not need have cross compilation support
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   367
  # and can be expected to be found in the default PATH. These tools are
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   368
  # used by configure. Nor are these tools expected to be found in the
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   369
  # devkit from the builddeps server either, since they are
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   370
  # needed to download the devkit.
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   371
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   372
  # First are all the simple required tools.
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   373
  BASIC_REQUIRE_PROGS(BASENAME, basename)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   374
  BASIC_REQUIRE_PROGS(BASH, bash)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   375
  BASIC_REQUIRE_PROGS(CAT, cat)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   376
  BASIC_REQUIRE_PROGS(CHMOD, chmod)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   377
  BASIC_REQUIRE_PROGS(CMP, cmp)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   378
  BASIC_REQUIRE_PROGS(COMM, comm)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   379
  BASIC_REQUIRE_PROGS(CP, cp)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   380
  BASIC_REQUIRE_PROGS(CUT, cut)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   381
  BASIC_REQUIRE_PROGS(DATE, date)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   382
  BASIC_REQUIRE_PROGS(DIFF, [gdiff diff])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   383
  BASIC_REQUIRE_PROGS(DIRNAME, dirname)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   384
  BASIC_REQUIRE_PROGS(ECHO, echo)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   385
  BASIC_REQUIRE_PROGS(EXPR, expr)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   386
  BASIC_REQUIRE_PROGS(FILE, file)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   387
  BASIC_REQUIRE_PROGS(FIND, find)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   388
  BASIC_REQUIRE_PROGS(HEAD, head)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   389
  BASIC_REQUIRE_PROGS(LN, ln)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   390
  BASIC_REQUIRE_PROGS(LS, ls)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   391
  BASIC_REQUIRE_PROGS(MKDIR, mkdir)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   392
  BASIC_REQUIRE_PROGS(MKTEMP, mktemp)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   393
  BASIC_REQUIRE_PROGS(MV, mv)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   394
  BASIC_REQUIRE_PROGS(NAWK, [nawk gawk awk])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   395
  BASIC_REQUIRE_PROGS(PRINTF, printf)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   396
  BASIC_REQUIRE_PROGS(RM, rm)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   397
  BASIC_REQUIRE_PROGS(SH, sh)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   398
  BASIC_REQUIRE_PROGS(SORT, sort)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   399
  BASIC_REQUIRE_PROGS(TAIL, tail)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   400
  BASIC_REQUIRE_PROGS(TAR, tar)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   401
  BASIC_REQUIRE_PROGS(TEE, tee)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   402
  BASIC_REQUIRE_PROGS(TOUCH, touch)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   403
  BASIC_REQUIRE_PROGS(TR, tr)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   404
  BASIC_REQUIRE_PROGS(UNAME, uname)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   405
  BASIC_REQUIRE_PROGS(UNIQ, uniq)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   406
  BASIC_REQUIRE_PROGS(WC, wc)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   407
  BASIC_REQUIRE_PROGS(WHICH, which)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   408
  BASIC_REQUIRE_PROGS(XARGS, xargs)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   409
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   410
  # Then required tools that require some special treatment.
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   411
  BASIC_REQUIRE_SPECIAL(AWK, [AC_PROG_AWK])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   412
  BASIC_REQUIRE_SPECIAL(GREP, [AC_PROG_GREP])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   413
  BASIC_REQUIRE_SPECIAL(EGREP, [AC_PROG_EGREP])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   414
  BASIC_REQUIRE_SPECIAL(FGREP, [AC_PROG_FGREP])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   415
  BASIC_REQUIRE_SPECIAL(SED, [AC_PROG_SED])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   416
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   417
  # Always force rm.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   418
  RM="$RM -f"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   419
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   420
  # pwd behaves differently on various platforms and some don't support the -L flag.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   421
  # Always use the bash builtin pwd to get uniform behavior.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   422
  THEPWDCMD=pwd
17662
8cae100e6f14 8014003: New build does not handle symlinks in workspace path
erikj
parents: 17661
diff changeset
   423
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   424
  # These are not required on all platforms
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   425
  BASIC_PATH_PROGS(CYGPATH, cygpath)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   426
  BASIC_PATH_PROGS(READLINK, [greadlink readlink])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   427
  BASIC_PATH_PROGS(DF, df)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   428
  BASIC_PATH_PROGS(SETFILE, SetFile)
25882
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
   429
  BASIC_PATH_PROGS(CPIO, [cpio bsdcpio])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   430
])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   431
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   432
# Setup basic configuration paths, and platform-specific stuff related to PATHs.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   433
AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   434
[
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   435
  # Save the current directory this script was started from
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   436
  CURDIR="$PWD"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   437
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   438
  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   439
    PATH_SEP=";"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   440
    BASIC_CHECK_PATHS_WINDOWS
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   441
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   442
    PATH_SEP=":"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   443
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   444
  AC_SUBST(PATH_SEP)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   445
22726
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   446
  # We get the top-level directory from the supporting wrappers.
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   447
  AC_MSG_CHECKING([for top-level directory])
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   448
  AC_MSG_RESULT([$TOPDIR])
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   449
  AC_SUBST(TOPDIR)
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   450
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   451
  # We can only call BASIC_FIXUP_PATH after BASIC_CHECK_PATHS_WINDOWS.
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   452
  BASIC_FIXUP_PATH(CURDIR)
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   453
  BASIC_FIXUP_PATH(TOPDIR)
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   454
  # SRC_ROOT is a traditional alias for TOPDIR.
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   455
  SRC_ROOT=$TOPDIR
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   456
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   457
  # Locate the directory of this script.
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   458
  AUTOCONF_DIR=$TOPDIR/common/autoconf
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   459
])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   460
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   461
AC_DEFUN_ONCE([BASIC_SETUP_DEVKIT],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   462
[
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   463
  AC_ARG_WITH([devkit], [AS_HELP_STRING([--with-devkit],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   464
      [use this devkit for compilers, tools and resources])],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   465
      [
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   466
        BASIC_FIXUP_PATH([with_devkit])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   467
        DEVKIT_ROOT="$with_devkit"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   468
        # Check for a meta data info file in the root of the devkit
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   469
        if test -f "$DEVKIT_ROOT/devkit.info"; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   470
          # This potentially sets the following:
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   471
          # DEVKIT_NAME: A descriptive name of the devkit
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   472
          # DEVKIT_TOOLCHAIN_PATH: Corresponds to --with-toolchain-path
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   473
          # DEVKIT_EXTRA_PATH: Corresponds to --with-extra-path
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   474
          # DEVKIT_SYSROOT: Corresponds to --with-sysroot
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   475
          . $DEVKIT_ROOT/devkit.info
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   476
        fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   477
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   478
        AC_MSG_CHECKING([for devkit])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   479
        if test "x$DEVKIT_NAME" != x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   480
          AC_MSG_RESULT([$DEVKIT_NAME in $DEVKIT_ROOT])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   481
        else
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   482
          AC_MSG_RESULT([$DEVKIT_ROOT])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   483
        fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   484
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   485
        if test "x$DEVKIT_EXTRA_PATH" != x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   486
          BASIC_PREPEND_TO_PATH([EXTRA_PATH],$DEVKIT_EXTRA_PATH)
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   487
        fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   488
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   489
        # Fallback default of just /bin if DEVKIT_PATH is not defined
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   490
        if test "x$DEVKIT_TOOLCHAIN_PATH" = x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   491
          DEVKIT_TOOLCHAIN_PATH="$DEVKIT_ROOT/bin"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   492
        fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   493
        BASIC_PREPEND_TO_PATH([TOOLCHAIN_PATH],$DEVKIT_TOOLCHAIN_PATH)
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   494
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   495
        # If DEVKIT_SYSROOT is set, use that, otherwise try a couple of known
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   496
        # places for backwards compatiblity.
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   497
        if test "x$DEVKIT_SYSROOT" != x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   498
          SYSROOT="$DEVKIT_SYSROOT"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   499
        elif test -d "$DEVKIT_ROOT/$host_alias/libc"; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   500
          SYSROOT="$DEVKIT_ROOT/$host_alias/libc"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   501
        elif test -d "$DEVKIT_ROOT/$host/sys-root"; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   502
          SYSROOT="$DEVKIT_ROOT/$host/sys-root"
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   503
        fi
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   504
      ]
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   505
  )
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   506
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   507
  # You can force the sysroot if the sysroot encoded into the compiler tools
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   508
  # is not correct.
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   509
  AC_ARG_WITH(sys-root, [AS_HELP_STRING([--with-sys-root],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   510
      [alias for --with-sysroot for backwards compatability])],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   511
      [SYSROOT=$with_sys_root]
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   512
  )
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   513
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   514
  AC_ARG_WITH(sysroot, [AS_HELP_STRING([--with-sysroot],
25034
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   515
      [use this directory as sysroot])],
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   516
      [SYSROOT=$with_sysroot]
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   517
  )
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   518
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   519
  AC_ARG_WITH([tools-dir], [AS_HELP_STRING([--with-tools-dir],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   520
      [alias for --with-toolchain-path for backwards compatibility])],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   521
      [BASIC_PREPEND_TO_PATH([TOOLCHAIN_PATH],$with_tools_dir)]
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   522
  )
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   523
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   524
  AC_ARG_WITH([toolchain-path], [AS_HELP_STRING([--with-toolchain-path],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   525
      [prepend these directories when searching for toolchain binaries (compilers etc)])],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   526
      [BASIC_PREPEND_TO_PATH([TOOLCHAIN_PATH],$with_toolchain_path)]
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   527
  )
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   528
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   529
  AC_ARG_WITH([extra-path], [AS_HELP_STRING([--with-extra-path],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   530
      [prepend these directories to the default path])],
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   531
      [BASIC_PREPEND_TO_PATH([EXTRA_PATH],$with_extra_path)]
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   532
  )
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   533
25034
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   534
  if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   535
    # detect if Xcode is installed by running xcodebuild -version
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   536
    # if no Xcode installed, xcodebuild exits with 1
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   537
    # if Xcode is installed, even if xcode-select is misconfigured, then it exits with 0
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   538
    if /usr/bin/xcodebuild -version >/dev/null 2>&1; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   539
      # We need to use xcodebuild in the toolchain dir provided by the user, this will
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   540
      # fall back on the stub binary in /usr/bin/xcodebuild
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   541
      AC_PATH_PROG([XCODEBUILD], [xcodebuild], [/usr/bin/xcodebuild], [$TOOLCHAIN_PATH])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   542
    else
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   543
      # this should result in SYSROOT being empty, unless --with-sysroot is provided
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   544
      # when only the command line tools are installed there are no SDKs, so headers
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   545
      # are copied into the system frameworks
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   546
      XCODEBUILD=
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   547
      AC_SUBST(XCODEBUILD)
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   548
    fi
27595
cff167b3bfa2 8065914: Various improvements and cleanup of build system
ihse
parents: 27586
diff changeset
   549
25034
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   550
    AC_MSG_CHECKING([for sdk name])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   551
    AC_ARG_WITH([sdk-name], [AS_HELP_STRING([--with-sdk-name],
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   552
        [use the platform SDK of the given name. @<:@macosx@:>@])],
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   553
        [SDKNAME=$with_sdk_name]
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   554
    )
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   555
    AC_MSG_RESULT([$SDKNAME])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   556
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   557
    # if toolchain path is specified then don't rely on system headers, they may not compile
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   558
    HAVE_SYSTEM_FRAMEWORK_HEADERS=0
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   559
    test -z "$TOOLCHAIN_PATH" && \
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   560
      HAVE_SYSTEM_FRAMEWORK_HEADERS=`test ! -f /System/Library/Frameworks/Foundation.framework/Headers/Foundation.h; echo $?`
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   561
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   562
    if test -z "$SYSROOT"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   563
      if test -n "$XCODEBUILD"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   564
        # if we don't have system headers, use default SDK name (last resort)
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   565
        if test -z "$SDKNAME" -a $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   566
          SDKNAME=${SDKNAME:-macosx}
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   567
        fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   568
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   569
        if test -n "$SDKNAME"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   570
          # Call xcodebuild to determine SYSROOT
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   571
          SYSROOT=`"$XCODEBUILD" -sdk $SDKNAME -version | grep '^Path: ' | sed 's/Path: //'`
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   572
        fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   573
      else
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   574
        if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   575
          AC_MSG_ERROR([No xcodebuild tool and no system framework headers found, use --with-sysroot or --with-sdk-name to provide a path to a valid SDK])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   576
        fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   577
      fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   578
    else
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   579
      # warn user if --with-sdk-name was also set
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   580
      if test -n "$with_sdk_name"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   581
        AC_MSG_WARN([Both SYSROOT and --with-sdk-name are set, only SYSROOT will be used])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   582
      fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   583
    fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   584
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   585
    if test $HAVE_SYSTEM_FRAMEWORK_HEADERS -eq 0 -a -z "$SYSROOT"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   586
      # If no system framework headers, then SYSROOT must be set, or we won't build
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   587
      AC_MSG_ERROR([Unable to determine SYSROOT and no headers found in /System/Library/Frameworks. Check Xcode configuration, --with-sysroot or --with-sdk-name arguments.])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   588
    fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   589
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   590
    # Perform a basic sanity test
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   591
    if test ! -f "$SYSROOT/System/Library/Frameworks/Foundation.framework/Headers/Foundation.h"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   592
      if test -z "$SYSROOT"; then
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   593
        AC_MSG_ERROR([Unable to find required framework headers, provide a path to an SDK via --with-sysroot or --with-sdk-name and be sure Xcode is installed properly])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   594
      else
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   595
        AC_MSG_ERROR([Invalid SDK or SYSROOT path, dependent framework headers not found])
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   596
      fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   597
    fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   598
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   599
    # set SDKROOT too, Xcode tools will pick it up
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   600
    AC_SUBST(SDKROOT,$SYSROOT)
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   601
  fi
d9ca34c227b8 8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents: 23428
diff changeset
   602
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   603
  # Prepend the extra path to the global path
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   604
  BASIC_PREPEND_TO_PATH([PATH],$EXTRA_PATH)
22726
d984085c5ff2 8035730: Configure fails in cygwin if current dir is in /home/user
ihse
parents: 22722
diff changeset
   605
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   606
  if test "x$OPENJDK_BUILD_OS" = "xsolaris"; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   607
    # Add extra search paths on solaris for utilities like ar and as etc...
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   608
    PATH="$PATH:/usr/ccs/bin:/usr/sfw/bin:/opt/csw/bin"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   609
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   610
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   611
  AC_MSG_CHECKING([for sysroot])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   612
  AC_MSG_RESULT([$SYSROOT])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   613
  AC_MSG_CHECKING([for toolchain path])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   614
  AC_MSG_RESULT([$TOOLCHAIN_PATH])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   615
  AC_MSG_CHECKING([for extra path])
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   616
  AC_MSG_RESULT([$EXTRA_PATH])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   617
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   618
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   619
AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   620
[
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   621
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   622
  AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   623
      [use this as the name of the configuration @<:@generated from important configuration options@:>@])],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   624
      [ CONF_NAME=${with_conf_name} ])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   625
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   626
  # Test from where we are running configure, in or outside of src root.
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   627
  AC_MSG_CHECKING([where to store configuration])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   628
  if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   629
      || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
21759
e24e22311718 8027566: Remove the old build system
ihse
parents: 21175
diff changeset
   630
      || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   631
    # We are running configure from the src root.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   632
    # Create a default ./build/target-variant-debuglevel output root.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   633
    if test "x${CONF_NAME}" = x; then
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   634
      AC_MSG_RESULT([in default location])
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   635
      CONF_NAME="${OPENJDK_TARGET_OS}-${OPENJDK_TARGET_CPU}-${JDK_VARIANT}-${ANDED_JVM_VARIANTS}-${DEBUG_LEVEL}"
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   636
    else
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   637
      AC_MSG_RESULT([in build directory with custom name])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   638
    fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   639
    OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   640
    $MKDIR -p "$OUTPUT_ROOT"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   641
    if test ! -d "$OUTPUT_ROOT"; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   642
      AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   643
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   644
  else
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   645
    # We are running configure from outside of the src dir.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   646
    # Then use the current directory as output dir!
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   647
    # If configuration is situated in normal build directory, just use the build
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   648
    # directory name as configuration name, otherwise use the complete path.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   649
    if test "x${CONF_NAME}" = x; then
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   650
      CONF_NAME=`$ECHO $CURDIR | $SED -e "s!^${SRC_ROOT}/build/!!"`
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   651
    fi
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   652
    OUTPUT_ROOT="$CURDIR"
22722
03797b5d2ba3 8035495: Improvements in autoconf integration
ihse
parents: 22721
diff changeset
   653
    AC_MSG_RESULT([in current directory])
14112
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   654
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   655
    # WARNING: This might be a bad thing to do. You need to be sure you want to
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   656
    # have a configuration in this directory. Do some sanity checks!
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   657
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   658
    if test ! -e "$OUTPUT_ROOT/spec.gmk"; then
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   659
      # If we have a spec.gmk, we have run here before and we are OK. Otherwise, check for
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   660
      # other files
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   661
      files_present=`$LS $OUTPUT_ROOT`
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   662
      # Configure has already touched config.log and confdefs.h in the current dir when this check
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14112
diff changeset
   663
      # is performed.
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14112
diff changeset
   664
      filtered_files=`$ECHO "$files_present" | $SED -e 's/config.log//g' -e 's/confdefs.h//g' -e 's/ //g' \
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   665
      | $TR -d '\n'`
14280
7d8ad47b2dbf 8002220: build-infra: update for mac, solaris 11 issues
erikj
parents: 14112
diff changeset
   666
      if test "x$filtered_files" != x; then
14112
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   667
        AC_MSG_NOTICE([Current directory is $CURDIR.])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   668
        AC_MSG_NOTICE([Since this is not the source root, configure will output the configuration here])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   669
        AC_MSG_NOTICE([(as opposed to creating a configuration in <src_root>/build/<conf-name>).])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   670
        AC_MSG_NOTICE([However, this directory is not empty. This is not allowed, since it could])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   671
        AC_MSG_NOTICE([seriously mess up just about everything.])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   672
        AC_MSG_NOTICE([Try 'cd $SRC_ROOT' and restart configure])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   673
        AC_MSG_NOTICE([(or create a new empty directory and cd to it).])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   674
        AC_MSG_ERROR([Will not continue creating configuration in $CURDIR])
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   675
      fi
1b447f5cb0d1 8001897: build-infra: misc adjustments to configure script
ihse
parents: 14111
diff changeset
   676
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   677
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   678
  AC_MSG_CHECKING([what configuration name to use])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   679
  AC_MSG_RESULT([$CONF_NAME])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   680
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   681
  BASIC_FIXUP_PATH(OUTPUT_ROOT)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   682
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   683
  AC_SUBST(SPEC, $OUTPUT_ROOT/spec.gmk)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   684
  AC_SUBST(CONF_NAME, $CONF_NAME)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   685
  AC_SUBST(OUTPUT_ROOT, $OUTPUT_ROOT)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   686
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   687
  # The spec.gmk file contains all variables for the make system.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   688
  AC_CONFIG_FILES([$OUTPUT_ROOT/spec.gmk:$AUTOCONF_DIR/spec.gmk.in])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   689
  # The hotspot-spec.gmk file contains legacy variables for the hotspot make system.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   690
  AC_CONFIG_FILES([$OUTPUT_ROOT/hotspot-spec.gmk:$AUTOCONF_DIR/hotspot-spec.gmk.in])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   691
  # The bootcycle-spec.gmk file contains support for boot cycle builds.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   692
  AC_CONFIG_FILES([$OUTPUT_ROOT/bootcycle-spec.gmk:$AUTOCONF_DIR/bootcycle-spec.gmk.in])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   693
  # The compare.sh is used to compare the build output to other builds.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   694
  AC_CONFIG_FILES([$OUTPUT_ROOT/compare.sh:$AUTOCONF_DIR/compare.sh.in])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   695
  # The generated Makefile knows where the spec.gmk is and where the source is.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   696
  # You can run make from the OUTPUT_ROOT, or from the top-level Makefile
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   697
  # which will look for generated configurations
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   698
  AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in])
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   699
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   700
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   701
AC_DEFUN_ONCE([BASIC_SETUP_LOGGING],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   702
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   703
  # Setup default logging of stdout and stderr to build.log in the output root.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   704
  BUILD_LOG='$(OUTPUT_ROOT)/build.log'
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   705
  BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old'
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   706
  BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)'
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   707
  AC_SUBST(BUILD_LOG)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   708
  AC_SUBST(BUILD_LOG_PREVIOUS)
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   709
  AC_SUBST(BUILD_LOG_WRAPPER)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   710
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   711
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   712
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   713
#%%% Simple tools %%%
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   714
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   715
# Check if we have found a usable version of make
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   716
# $1: the path to a potential make binary (or empty)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   717
# $2: the description on how we found this
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   718
AC_DEFUN([BASIC_CHECK_MAKE_VERSION],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   719
[
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   720
  MAKE_CANDIDATE="$1"
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   721
  DESCRIPTION="$2"
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   722
  if test "x$MAKE_CANDIDATE" != x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   723
    AC_MSG_NOTICE([Testing potential make at $MAKE_CANDIDATE, found using $DESCRIPTION])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   724
    MAKE_VERSION_STRING=`$MAKE_CANDIDATE --version | $HEAD -n 1`
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   725
    IS_GNU_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP 'GNU Make'`
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   726
    if test "x$IS_GNU_MAKE" = x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   727
      AC_MSG_NOTICE([Found potential make at $MAKE_CANDIDATE, however, this is not GNU Make. Ignoring.])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   728
    else
21174
9aed46288b75 8027567: JDK 8 build failure: the correct version of GNU make is being rejected
vinnie
parents: 20650
diff changeset
   729
      IS_MODERN_MAKE=`$ECHO $MAKE_VERSION_STRING | $GREP -e '3\.8[[12]]' -e '4\.'`
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   730
      if test "x$IS_MODERN_MAKE" = x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   731
        AC_MSG_NOTICE([Found GNU make at $MAKE_CANDIDATE, however this is not version 3.81 or later. (it is: $MAKE_VERSION_STRING). Ignoring.])
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   732
      else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   733
        if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   734
          if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   735
            MAKE_EXPECTED_ENV='cygwin'
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   736
          elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   737
            MAKE_EXPECTED_ENV='msys'
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   738
          else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   739
            AC_MSG_ERROR([Unknown Windows environment])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   740
          fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   741
          MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   742
          IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   743
        else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   744
          # Not relevant for non-Windows
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   745
          IS_MAKE_CORRECT_ENV=true
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   746
        fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   747
        if test "x$IS_MAKE_CORRECT_ENV" = x; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   748
          AC_MSG_NOTICE([Found GNU make version $MAKE_VERSION_STRING at $MAKE_CANDIDATE, but it is not for $MAKE_EXPECTED_ENV (it says: $MAKE_BUILT_FOR). Ignoring.])
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   749
        else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   750
          FOUND_MAKE=$MAKE_CANDIDATE
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   751
          BASIC_FIXUP_EXECUTABLE(FOUND_MAKE)
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   752
        fi
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   753
      fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   754
    fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   755
  fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   756
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   757
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   758
AC_DEFUN([BASIC_CHECK_MAKE_OUTPUT_SYNC],
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   759
[
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   760
  # Check if make supports the output sync option and if so, setup using it.
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   761
  AC_MSG_CHECKING([if make --output-sync is supported])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   762
  if $MAKE --version -O > /dev/null 2>&1; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   763
    OUTPUT_SYNC_SUPPORTED=true
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   764
    AC_MSG_RESULT([yes])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   765
    AC_MSG_CHECKING([for output-sync value])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   766
    AC_ARG_WITH([output-sync], [AS_HELP_STRING([--with-output-sync],
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   767
      [set make output sync type if supported by make. @<:@recurse@:>@])],
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   768
      [OUTPUT_SYNC=$with_output_sync])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   769
    if test "x$OUTPUT_SYNC" = "x"; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   770
      OUTPUT_SYNC=none
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   771
    fi
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   772
    AC_MSG_RESULT([$OUTPUT_SYNC])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   773
    if ! $MAKE --version -O$OUTPUT_SYNC > /dev/null 2>&1; then
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   774
      AC_MSG_ERROR([Make did not the support the value $OUTPUT_SYNC as output sync type.])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   775
    fi
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   776
  else
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   777
    OUTPUT_SYNC_SUPPORTED=false
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   778
    AC_MSG_RESULT([no])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   779
  fi
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   780
  AC_SUBST(OUTPUT_SYNC_SUPPORTED)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   781
  AC_SUBST(OUTPUT_SYNC)
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   782
])
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   783
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   784
# Goes looking for a usable version of GNU make.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   785
AC_DEFUN([BASIC_CHECK_GNU_MAKE],
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   786
[
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   787
  # We need to find a recent version of GNU make. Especially on Solaris, this can be tricky.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   788
  if test "x$MAKE" != x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   789
    # User has supplied a make, test it.
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   790
    if test ! -f "$MAKE"; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   791
      AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not found.])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   792
    fi
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   793
    BASIC_CHECK_MAKE_VERSION("$MAKE", [user supplied MAKE=$MAKE])
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   794
    if test "x$FOUND_MAKE" = x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   795
      AC_MSG_ERROR([The specified make (by MAKE=$MAKE) is not GNU make 3.81 or newer.])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   796
    fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   797
  else
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   798
    # Try our hardest to locate a correct version of GNU make
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   799
    AC_PATH_PROGS(CHECK_GMAKE, gmake)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   800
    BASIC_CHECK_MAKE_VERSION("$CHECK_GMAKE", [gmake in PATH])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   801
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   802
    if test "x$FOUND_MAKE" = x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   803
      AC_PATH_PROGS(CHECK_MAKE, make)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   804
      BASIC_CHECK_MAKE_VERSION("$CHECK_MAKE", [make in PATH])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   805
    fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   806
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   807
    if test "x$FOUND_MAKE" = x; then
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   808
      if test "x$TOOLCHAIN_PATH" != x; then
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   809
        # We have a toolchain path, check that as well before giving up.
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   810
        OLD_PATH=$PATH
23428
3c8a05bf4656 8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents: 22726
diff changeset
   811
        PATH=$TOOLCHAIN_PATH:$PATH
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   812
        AC_PATH_PROGS(CHECK_TOOLSDIR_GMAKE, gmake)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   813
        BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_GMAKE", [gmake in tools-dir])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   814
        if test "x$FOUND_MAKE" = x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   815
          AC_PATH_PROGS(CHECK_TOOLSDIR_MAKE, make)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   816
          BASIC_CHECK_MAKE_VERSION("$CHECK_TOOLSDIR_MAKE", [make in tools-dir])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   817
        fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   818
        PATH=$OLD_PATH
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   819
      fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   820
    fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   821
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   822
    if test "x$FOUND_MAKE" = x; then
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   823
      AC_MSG_ERROR([Cannot find GNU make 3.81 or newer! Please put it in the path, or add e.g. MAKE=/opt/gmake3.81/make as argument to configure.])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   824
    fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   825
  fi
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   826
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   827
  MAKE=$FOUND_MAKE
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   828
  AC_SUBST(MAKE)
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   829
  AC_MSG_NOTICE([Using GNU make 3.81 (or later) at $FOUND_MAKE (version: $MAKE_VERSION_STRING)])
25854
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   830
98ce0879ab4c 8054834: Modular Source Code
chegar
parents: 25034
diff changeset
   831
  BASIC_CHECK_MAKE_OUTPUT_SYNC
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   832
])
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   833
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   834
AC_DEFUN([BASIC_CHECK_FIND_DELETE],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   835
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   836
  # Test if find supports -delete
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   837
  AC_MSG_CHECKING([if find supports -delete])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   838
  FIND_DELETE="-delete"
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   839
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   840
  DELETEDIR=`$MKTEMP -d tmp.XXXXXXXXXX` || (echo Could not create temporary directory!; exit $?)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   841
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   842
  echo Hejsan > $DELETEDIR/TestIfFindSupportsDelete
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   843
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   844
  TEST_DELETE=`$FIND "$DELETEDIR" -name TestIfFindSupportsDelete $FIND_DELETE 2>&1`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   845
  if test -f $DELETEDIR/TestIfFindSupportsDelete; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   846
    # No, it does not.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   847
    rm $DELETEDIR/TestIfFindSupportsDelete
26130
2ea1262921e0 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 25882
diff changeset
   848
    if test "x$OPENJDK_TARGET_OS" = "xaix"; then
2ea1262921e0 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 25882
diff changeset
   849
      # AIX 'find' is buggy if called with '-exec {} \+' and an empty file list
2ea1262921e0 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 25882
diff changeset
   850
      FIND_DELETE="-print | xargs rm"
2ea1262921e0 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 25882
diff changeset
   851
    else
2ea1262921e0 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 25882
diff changeset
   852
      FIND_DELETE="-exec rm \{\} \+"
2ea1262921e0 8056246: Fix AIX build after the Modular Source Code change 8054834
simonis
parents: 25882
diff changeset
   853
    fi
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   854
    AC_MSG_RESULT([no])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   855
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   856
    AC_MSG_RESULT([yes])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   857
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   858
  rmdir $DELETEDIR
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   859
  AC_SUBST(FIND_DELETE)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   860
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   861
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   862
AC_DEFUN_ONCE([BASIC_SETUP_COMPLEX_TOOLS],
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   863
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   864
  BASIC_CHECK_GNU_MAKE
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   865
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   866
  BASIC_CHECK_FIND_DELETE
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   867
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   868
  # These tools might not be installed by default,
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   869
  # need hint on how to install them.
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   870
  BASIC_REQUIRE_PROGS(UNZIP, unzip)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   871
  BASIC_REQUIRE_PROGS(ZIP, zip)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   872
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   873
  # Non-required basic tools
13697
5262b00bc10c 7197849: Update new build-infra makefiles
ohair
parents: 13133
diff changeset
   874
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   875
  BASIC_PATH_PROGS(LDD, ldd)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   876
  if test "x$LDD" = "x"; then
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   877
    # List shared lib dependencies is used for
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   878
    # debug output and checking for forbidden dependencies.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   879
    # We can build without it.
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   880
    LDD="true"
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   881
  fi
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   882
  BASIC_PATH_PROGS(OTOOL, otool)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   883
  if test "x$OTOOL" = "x"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   884
    OTOOL="true"
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   885
  fi
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   886
  BASIC_PATH_PROGS(READELF, [greadelf readelf])
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   887
  BASIC_PATH_PROGS(HG, hg)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   888
  BASIC_PATH_PROGS(STAT, stat)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   889
  BASIC_PATH_PROGS(TIME, time)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   890
  # Check if it's GNU time
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   891
  IS_GNU_TIME=`$TIME --version 2>&1 | $GREP 'GNU time'`
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   892
  if test "x$IS_GNU_TIME" != x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   893
    IS_GNU_TIME=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   894
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   895
    IS_GNU_TIME=no
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   896
  fi
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   897
  AC_SUBST(IS_GNU_TIME)
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   898
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   899
  if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   900
    BASIC_REQUIRE_PROGS(COMM, comm)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   901
  fi
16580
6acb502beafa 8008373: JFR JTReg tests fail with CompilationError on MacOSX; missing '._sunec.jar'
erikj
parents: 15056
diff changeset
   902
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   903
  if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   904
    BASIC_REQUIRE_PROGS(DSYMUTIL, dsymutil)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   905
    BASIC_REQUIRE_PROGS(XATTR, xattr)
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   906
    BASIC_PATH_PROGS(CODESIGN, codesign)
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   907
    if test "x$CODESIGN" != "x"; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   908
      # Verify that the openjdk_codesign certificate is present
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   909
      AC_MSG_CHECKING([if openjdk_codesign certificate is present])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   910
      rm -f codesign-testfile
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   911
      touch codesign-testfile
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   912
      codesign -s openjdk_codesign codesign-testfile 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD || CODESIGN=
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   913
      rm -f codesign-testfile
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   914
      if test "x$CODESIGN" = x; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   915
        AC_MSG_RESULT([no])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   916
      else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   917
        AC_MSG_RESULT([yes])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   918
      fi
17661
55c5e0f7b9cc 8013489: New build system does not run codesign on SA-related launchers on OS X
erikj
parents: 17593
diff changeset
   919
    fi
55c5e0f7b9cc 8013489: New build system does not run codesign on SA-related launchers on OS X
erikj
parents: 17593
diff changeset
   920
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   921
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   922
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   923
# Check if build directory is on local disk. If not possible to determine,
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   924
# we prefer to claim it's local.
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   925
# Argument 1: directory to test
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   926
# Argument 2: what to do if it is on local disk
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   927
# Argument 3: what to do otherwise (remote disk or failure)
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   928
AC_DEFUN([BASIC_CHECK_DIR_ON_LOCAL_DISK],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   929
[
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   930
  # df -l lists only local disks; if the given directory is not found then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   931
  # a non-zero exit code is given
14111
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   932
  if test "x$DF" = x; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   933
    if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   934
      # msys does not have df; use Windows "net use" instead.
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   935
      IS_NETWORK_DISK=`net use | grep \`pwd -W | cut -d ":" -f 1 | tr a-z A-Z\`:`
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   936
      if test "x$IS_NETWORK_DISK" = x; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   937
        $2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   938
      else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   939
        $3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   940
      fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   941
    else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   942
      # No df here, say it's local
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   943
      $2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   944
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   945
  else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   946
    if $DF -l $1 > /dev/null 2>&1; then
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   947
      $2
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   948
    else
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   949
      $3
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   950
    fi
2a82ecb35fc7 8000992: Update new build-infra makefiles
ohair
parents: 13697
diff changeset
   951
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   952
])
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   953
15050
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
   954
# Check that source files have basic read permissions set. This might
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
   955
# not be the case in cygwin in certain conditions.
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
   956
AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
   957
[
25882
bd4315f0084b 8022177: Windows/MSYS builds broken
erikj
parents: 25854
diff changeset
   958
  if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
15050
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
   959
    file_to_test="$SRC_ROOT/LICENSE"
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
   960
    if test `$STAT -c '%a' "$file_to_test"` -lt 400; then
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
   961
      AC_MSG_ERROR([Bad file permissions on src files. This is usually caused by cloning the repositories with a non cygwin hg in a directory not created in cygwin.])
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
   962
    fi
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
   963
  fi
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
   964
])
98a901883580 8001942: build-infra: General permission problems on Windows/cygwin
erikj
parents: 14736
diff changeset
   965
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   966
AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   967
[
22475
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   968
  # Did user specify any unknown variables?
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   969
  BASIC_CHECK_LEFTOVER_OVERRIDDEN
777928354ad9 8031759: Improved tool overriding in configure
ihse
parents: 22474
diff changeset
   970
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   971
  AC_MSG_CHECKING([if build directory is on local disk])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   972
  BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUT_ROOT,
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   973
      [OUTPUT_DIR_IS_LOCAL="yes"],
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   974
      [OUTPUT_DIR_IS_LOCAL="no"])
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   975
  AC_MSG_RESULT($OUTPUT_DIR_IS_LOCAL)
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   976
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   977
  BASIC_CHECK_SRC_PERMS
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   978
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   979
  # Check if the user has any old-style ALT_ variables set.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   980
  FOUND_ALT_VARIABLES=`env | grep ^ALT_`
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   981
20363
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   982
  # Before generating output files, test if they exist. If they do, this is a reconfigure.
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   983
  # Since we can't properly handle the dependencies for this, warn the user about the situation
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   984
  if test -e $OUTPUT_ROOT/spec.gmk; then
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   985
    IS_RECONFIGURE=yes
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   986
  else
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   987
    IS_RECONFIGURE=no
fa7663fc5d50 8001931: The new build system whitespace cleanup
ihse
parents: 19763
diff changeset
   988
  fi
13133
701e61c32ece 7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff changeset
   989
])
28602
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
   990
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
   991
# Check for support for specific options in bash
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
   992
AC_DEFUN_ONCE([BASIC_CHECK_BASH_OPTIONS],
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
   993
[
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
   994
  # Test if bash supports pipefail.
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
   995
  AC_MSG_CHECKING([if bash supports pipefail])
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
   996
  if ${BASH} -c 'set -o pipefail'; then
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
   997
    BASH_ARGS="$BASH_ARGS -o pipefail"
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
   998
    AC_MSG_RESULT([yes])
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
   999
  else
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1000
    AC_MSG_RESULT([no])
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1001
  fi
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1002
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1003
  AC_MSG_CHECKING([if bash supports errexit (-e)])
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1004
  if ${BASH} -e -c 'true'; then
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1005
    BASH_ARGS="$BASH_ARGS -e"
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1006
    AC_MSG_RESULT([yes])
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1007
  else
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1008
    AC_MSG_RESULT([no])
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1009
  fi
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1010
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1011
  AC_SUBST(BASH_ARGS)
51c0dcf51b67 8065576: Enable pipefail in the shell used by make to better detect build errors
erikj
parents: 27595
diff changeset
  1012
])