author | lana |
Fri, 11 Nov 2016 05:11:53 +0000 | |
changeset 41987 | 5fce5ec624c7 |
parent 41040 | 7b919a4497ff |
child 42294 | d8c997ec29fe |
permissions | -rw-r--r-- |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1 |
# |
35747 | 2 |
# Copyright (c) 2011, 2016, 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 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
26 |
######################################################################## |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
27 |
# This file is responsible for detecting, verifying and setting up the |
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
28 |
# toolchain, i.e. the compiler, linker and related utilities. It will setup |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
29 |
# proper paths to the binaries, but it will not setup any flags. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
30 |
# |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
31 |
# The binaries used is determined by the toolchain type, which is the family of |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
32 |
# compilers and related tools that are used. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
33 |
######################################################################## |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
34 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
35 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
36 |
# All valid toolchains, regardless of platform (used by help.m4) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
37 |
VALID_TOOLCHAINS_all="gcc clang solstudio xlc microsoft" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
38 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
39 |
# These toolchains are valid on different platforms |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
40 |
VALID_TOOLCHAINS_linux="gcc clang" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
41 |
VALID_TOOLCHAINS_solaris="solstudio" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
42 |
VALID_TOOLCHAINS_macosx="gcc clang" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
43 |
VALID_TOOLCHAINS_aix="xlc" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
44 |
VALID_TOOLCHAINS_windows="microsoft" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
45 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
46 |
# Toolchain descriptions |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
47 |
TOOLCHAIN_DESCRIPTION_clang="clang/LLVM" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
48 |
TOOLCHAIN_DESCRIPTION_gcc="GNU Compiler Collection" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
49 |
TOOLCHAIN_DESCRIPTION_microsoft="Microsoft Visual Studio" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
50 |
TOOLCHAIN_DESCRIPTION_solstudio="Oracle Solaris Studio" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
51 |
TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
52 |
|
35747 | 53 |
# Minimum supported versions, empty means unspecified |
54 |
TOOLCHAIN_MINIMUM_VERSION_clang="3.2" |
|
55 |
TOOLCHAIN_MINIMUM_VERSION_gcc="4.3" |
|
56 |
TOOLCHAIN_MINIMUM_VERSION_microsoft="" |
|
39948
cfb05dbae510
8160825: Update minimum Solaris Studio compiler version to 5.13
sanzinger
parents:
39115
diff
changeset
|
57 |
TOOLCHAIN_MINIMUM_VERSION_solstudio="5.13" |
35747 | 58 |
TOOLCHAIN_MINIMUM_VERSION_xlc="" |
59 |
||
60 |
# Prepare the system so that TOOLCHAIN_CHECK_COMPILER_VERSION can be called. |
|
61 |
# Must have CC_VERSION_NUMBER and CXX_VERSION_NUMBER. |
|
37864
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
62 |
# $1 - optional variable prefix for compiler and version variables (BUILD_) |
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
63 |
# $2 - optional variable prefix for comparable variable (OPENJDK_BUILD_) |
35747 | 64 |
AC_DEFUN([TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS], |
65 |
[ |
|
37864
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
66 |
if test "x[$]$1CC_VERSION_NUMBER" != "x[$]$1CXX_VERSION_NUMBER"; then |
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
67 |
AC_MSG_WARN([C and C++ compiler have different version numbers, [$]$1CC_VERSION_NUMBER vs [$]$1CXX_VERSION_NUMBER.]) |
35747 | 68 |
AC_MSG_WARN([This typically indicates a broken setup, and is not supported]) |
69 |
fi |
|
70 |
||
71 |
# We only check CC_VERSION_NUMBER since we assume CXX_VERSION_NUMBER is equal. |
|
37864
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
72 |
if [ [[ "[$]$1CC_VERSION_NUMBER" =~ (.*\.){3} ]] ]; then |
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
73 |
AC_MSG_WARN([C compiler version number has more than three parts (X.Y.Z): [$]$1CC_VERSION_NUMBER. Comparisons might be wrong.]) |
35747 | 74 |
fi |
75 |
||
37864
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
76 |
if [ [[ "[$]$1CC_VERSION_NUMBER" =~ [0-9]{6} ]] ]; then |
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
77 |
AC_MSG_WARN([C compiler version number has a part larger than 99999: [$]$1CC_VERSION_NUMBER. Comparisons might be wrong.]) |
35747 | 78 |
fi |
79 |
||
37864
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
80 |
$2COMPARABLE_ACTUAL_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", [$]1, [$]2, [$]3) }' <<< "[$]$1CC_VERSION_NUMBER"` |
35747 | 81 |
]) |
82 |
||
83 |
# Check if the configured compiler (C and C++) is of a specific version or |
|
84 |
# newer. TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS must have been called before. |
|
85 |
# |
|
86 |
# Arguments: |
|
87 |
# VERSION: The version string to check against the found version |
|
88 |
# IF_AT_LEAST: block to run if the compiler is at least this version (>=) |
|
89 |
# IF_OLDER_THAN: block to run if the compiler is older than this version (<) |
|
37864
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
90 |
# PREFIX: Optional variable prefix for compiler to compare version for (OPENJDK_BUILD_) |
35747 | 91 |
BASIC_DEFUN_NAMED([TOOLCHAIN_CHECK_COMPILER_VERSION], |
37864
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
92 |
[*VERSION PREFIX IF_AT_LEAST IF_OLDER_THAN], [$@], |
35747 | 93 |
[ |
94 |
# Need to assign to a variable since m4 is blocked from modifying parts in []. |
|
95 |
REFERENCE_VERSION=ARG_VERSION |
|
96 |
||
97 |
if [ [[ "$REFERENCE_VERSION" =~ (.*\.){3} ]] ]; then |
|
36535
141db8da8c18
8151841: Build needs additional flags to compile with GCC 6
andrew
parents:
35747
diff
changeset
|
98 |
AC_MSG_ERROR([Internal error: Cannot compare to ARG_VERSION, only three parts (X.Y.Z) is supported]) |
35747 | 99 |
fi |
100 |
||
101 |
if [ [[ "$REFERENCE_VERSION" =~ [0-9]{6} ]] ]; then |
|
36535
141db8da8c18
8151841: Build needs additional flags to compile with GCC 6
andrew
parents:
35747
diff
changeset
|
102 |
AC_MSG_ERROR([Internal error: Cannot compare to ARG_VERSION, only parts < 99999 is supported]) |
35747 | 103 |
fi |
104 |
||
105 |
# Version comparison method inspired by http://stackoverflow.com/a/24067243 |
|
106 |
COMPARABLE_REFERENCE_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", [$]1, [$]2, [$]3) }' <<< "$REFERENCE_VERSION"` |
|
107 |
||
37864
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
108 |
if test [$]ARG_PREFIX[COMPARABLE_ACTUAL_VERSION] -ge $COMPARABLE_REFERENCE_VERSION ; then |
35747 | 109 |
: |
110 |
ARG_IF_AT_LEAST |
|
111 |
else |
|
112 |
: |
|
113 |
ARG_IF_OLDER_THAN |
|
114 |
fi |
|
115 |
]) |
|
116 |
||
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
117 |
# Setup a number of variables describing how native output files are |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
118 |
# named on this platform/toolchain. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
119 |
AC_DEFUN([TOOLCHAIN_SETUP_FILENAME_PATTERNS], |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
120 |
[ |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
121 |
# Define filename patterns |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
122 |
if test "x$OPENJDK_TARGET_OS" = xwindows; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
123 |
LIBRARY_PREFIX= |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
124 |
SHARED_LIBRARY_SUFFIX='.dll' |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
125 |
STATIC_LIBRARY_SUFFIX='.lib' |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
126 |
SHARED_LIBRARY='[$]1.dll' |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
127 |
STATIC_LIBRARY='[$]1.lib' |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
128 |
OBJ_SUFFIX='.obj' |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
129 |
EXE_SUFFIX='.exe' |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
130 |
else |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
131 |
LIBRARY_PREFIX=lib |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
132 |
SHARED_LIBRARY_SUFFIX='.so' |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
133 |
STATIC_LIBRARY_SUFFIX='.a' |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
134 |
SHARED_LIBRARY='lib[$]1.so' |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
135 |
STATIC_LIBRARY='lib[$]1.a' |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
136 |
OBJ_SUFFIX='.o' |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
137 |
EXE_SUFFIX='' |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
138 |
if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
33562
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32810
diff
changeset
|
139 |
# For full static builds, we're overloading the SHARED_LIBRARY |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32810
diff
changeset
|
140 |
# variables in order to limit the amount of changes required. |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32810
diff
changeset
|
141 |
# It would be better to remove SHARED and just use LIBRARY and |
34923 | 142 |
# LIBRARY_SUFFIX for libraries that can be built either |
143 |
# shared or static and use STATIC_* for libraries that are |
|
33562
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32810
diff
changeset
|
144 |
# always built statically. |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32810
diff
changeset
|
145 |
if test "x$STATIC_BUILD" = xtrue; then |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32810
diff
changeset
|
146 |
SHARED_LIBRARY='lib[$]1.a' |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32810
diff
changeset
|
147 |
SHARED_LIBRARY_SUFFIX='.a' |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32810
diff
changeset
|
148 |
else |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32810
diff
changeset
|
149 |
SHARED_LIBRARY='lib[$]1.dylib' |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32810
diff
changeset
|
150 |
SHARED_LIBRARY_SUFFIX='.dylib' |
c76b2fa11486
8136556: Add the ability to perform static builds of MacOSX x64 binaries
bobv
parents:
32810
diff
changeset
|
151 |
fi |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
152 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
153 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
154 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
155 |
AC_SUBST(LIBRARY_PREFIX) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
156 |
AC_SUBST(SHARED_LIBRARY_SUFFIX) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
157 |
AC_SUBST(STATIC_LIBRARY_SUFFIX) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
158 |
AC_SUBST(SHARED_LIBRARY) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
159 |
AC_SUBST(STATIC_LIBRARY) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
160 |
AC_SUBST(OBJ_SUFFIX) |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
161 |
AC_SUBST(EXE_SUFFIX) |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
162 |
]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
163 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
164 |
# Determine which toolchain type to use, and make sure it is valid for this |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
165 |
# platform. Setup various information about the selected toolchain. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
166 |
AC_DEFUN_ONCE([TOOLCHAIN_DETERMINE_TOOLCHAIN_TYPE], |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
167 |
[ |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
168 |
AC_ARG_WITH(toolchain-type, [AS_HELP_STRING([--with-toolchain-type], |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
169 |
[the toolchain type (or family) to use, use '--help' to show possible values @<:@platform dependent@:>@])]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
170 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
171 |
# Use indirect variable referencing |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
172 |
toolchain_var_name=VALID_TOOLCHAINS_$OPENJDK_BUILD_OS |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
173 |
VALID_TOOLCHAINS=${!toolchain_var_name} |
23161
85635b5bf0a6
8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents:
22724
diff
changeset
|
174 |
|
85635b5bf0a6
8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents:
22724
diff
changeset
|
175 |
if test "x$OPENJDK_TARGET_OS" = xmacosx; then |
25034
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
176 |
if test -n "$XCODEBUILD"; then |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
177 |
# On Mac OS X, default toolchain to clang after Xcode 5 |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
178 |
XCODE_VERSION_OUTPUT=`"$XCODEBUILD" -version 2>&1 | $HEAD -n 1` |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
179 |
$ECHO "$XCODE_VERSION_OUTPUT" | $GREP "Xcode " > /dev/null |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
180 |
if test $? -ne 0; then |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
181 |
AC_MSG_ERROR([Failed to determine Xcode version.]) |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
182 |
fi |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
183 |
XCODE_MAJOR_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | \ |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
184 |
$SED -e 's/^Xcode \(@<:@1-9@:>@@<:@0-9.@:>@*\)/\1/' | \ |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
185 |
$CUT -f 1 -d .` |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
186 |
AC_MSG_NOTICE([Xcode major version: $XCODE_MAJOR_VERSION]) |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
187 |
if test $XCODE_MAJOR_VERSION -ge 5; then |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
188 |
DEFAULT_TOOLCHAIN="clang" |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
189 |
else |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
190 |
DEFAULT_TOOLCHAIN="gcc" |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
191 |
fi |
23161
85635b5bf0a6
8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents:
22724
diff
changeset
|
192 |
else |
25034
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
193 |
# If Xcode is not installed, but the command line tools are |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
194 |
# then we can't run xcodebuild. On these systems we should |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
195 |
# default to clang |
d9ca34c227b8
8043340: [macosx] Fix hard-wired paths to JavaVM.framework
ddehaven
parents:
24911
diff
changeset
|
196 |
DEFAULT_TOOLCHAIN="clang" |
23161
85635b5bf0a6
8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents:
22724
diff
changeset
|
197 |
fi |
85635b5bf0a6
8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents:
22724
diff
changeset
|
198 |
else |
85635b5bf0a6
8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents:
22724
diff
changeset
|
199 |
# First toolchain type in the list is the default |
85635b5bf0a6
8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents:
22724
diff
changeset
|
200 |
DEFAULT_TOOLCHAIN=${VALID_TOOLCHAINS%% *} |
85635b5bf0a6
8019470: Changes needed to compile JDK 8 on MacOS with clang compiler
henryjen
parents:
22724
diff
changeset
|
201 |
fi |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
202 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
203 |
if test "x$with_toolchain_type" = xlist; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
204 |
# List all toolchains |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
205 |
AC_MSG_NOTICE([The following toolchains are valid on this platform:]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
206 |
for toolchain in $VALID_TOOLCHAINS; do |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
207 |
toolchain_var_name=TOOLCHAIN_DESCRIPTION_$toolchain |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
208 |
TOOLCHAIN_DESCRIPTION=${!toolchain_var_name} |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
209 |
$PRINTF " %-10s %s\n" $toolchain "$TOOLCHAIN_DESCRIPTION" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
210 |
done |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
211 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
212 |
exit 0 |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
213 |
elif test "x$with_toolchain_type" != x; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
214 |
# User override; check that it is valid |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
215 |
if test "x${VALID_TOOLCHAINS/$with_toolchain_type/}" = "x${VALID_TOOLCHAINS}"; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
216 |
AC_MSG_NOTICE([Toolchain type $with_toolchain_type is not valid on this platform.]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
217 |
AC_MSG_NOTICE([Valid toolchains: $VALID_TOOLCHAINS.]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
218 |
AC_MSG_ERROR([Cannot continue.]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
219 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
220 |
TOOLCHAIN_TYPE=$with_toolchain_type |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
221 |
else |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
222 |
# No flag given, use default |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
223 |
TOOLCHAIN_TYPE=$DEFAULT_TOOLCHAIN |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
224 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
225 |
AC_SUBST(TOOLCHAIN_TYPE) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
226 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
227 |
TOOLCHAIN_CC_BINARY_clang="clang" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
228 |
TOOLCHAIN_CC_BINARY_gcc="gcc" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
229 |
TOOLCHAIN_CC_BINARY_microsoft="cl" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
230 |
TOOLCHAIN_CC_BINARY_solstudio="cc" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
231 |
TOOLCHAIN_CC_BINARY_xlc="xlc_r" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
232 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
233 |
TOOLCHAIN_CXX_BINARY_clang="clang++" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
234 |
TOOLCHAIN_CXX_BINARY_gcc="g++" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
235 |
TOOLCHAIN_CXX_BINARY_microsoft="cl" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
236 |
TOOLCHAIN_CXX_BINARY_solstudio="CC" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
237 |
TOOLCHAIN_CXX_BINARY_xlc="xlC_r" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
238 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
239 |
# Use indirect variable referencing |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
240 |
toolchain_var_name=TOOLCHAIN_DESCRIPTION_$TOOLCHAIN_TYPE |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
241 |
TOOLCHAIN_DESCRIPTION=${!toolchain_var_name} |
35747 | 242 |
toolchain_var_name=TOOLCHAIN_MINIMUM_VERSION_$TOOLCHAIN_TYPE |
243 |
TOOLCHAIN_MINIMUM_VERSION=${!toolchain_var_name} |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
244 |
toolchain_var_name=TOOLCHAIN_CC_BINARY_$TOOLCHAIN_TYPE |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
245 |
TOOLCHAIN_CC_BINARY=${!toolchain_var_name} |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
246 |
toolchain_var_name=TOOLCHAIN_CXX_BINARY_$TOOLCHAIN_TYPE |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
247 |
TOOLCHAIN_CXX_BINARY=${!toolchain_var_name} |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
248 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
249 |
TOOLCHAIN_SETUP_FILENAME_PATTERNS |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
250 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
251 |
if test "x$TOOLCHAIN_TYPE" = "x$DEFAULT_TOOLCHAIN"; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
252 |
AC_MSG_NOTICE([Using default toolchain $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION)]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
253 |
else |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
254 |
AC_MSG_NOTICE([Using user selected toolchain $TOOLCHAIN_TYPE ($TOOLCHAIN_DESCRIPTION). Default toolchain is $DEFAULT_TOOLCHAIN.]) |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
255 |
fi |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
256 |
]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
257 |
|
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
258 |
# Before we start detecting the toolchain executables, we might need some |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
259 |
# special setup, e.g. additional paths etc. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
260 |
AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION], |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
261 |
[ |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
262 |
# FIXME: Is this needed? |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
263 |
AC_LANG(C++) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
264 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
265 |
# Store the CFLAGS etc passed to the configure script. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
266 |
ORG_CFLAGS="$CFLAGS" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
267 |
ORG_CXXFLAGS="$CXXFLAGS" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
268 |
|
30022 | 269 |
# autoconf magic only relies on PATH, so update it if tools dir is specified |
270 |
OLD_PATH="$PATH" |
|
271 |
||
22724
072f729936a9
8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents:
22721
diff
changeset
|
272 |
# On Windows, we need to detect the visual studio installation first. |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
273 |
# This will change the PATH, but we need to keep that new PATH even |
22724
072f729936a9
8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents:
22721
diff
changeset
|
274 |
# after toolchain detection is done, since the compiler (on x86) uses |
072f729936a9
8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents:
22721
diff
changeset
|
275 |
# it for DLL resolution in runtime. |
30022 | 276 |
if test "x$OPENJDK_BUILD_OS" = "xwindows" \ |
277 |
&& test "x$TOOLCHAIN_TYPE" = "xmicrosoft"; then |
|
22724
072f729936a9
8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents:
22721
diff
changeset
|
278 |
TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV |
23429 | 279 |
# Reset path to VS_PATH. It will include everything that was on PATH at the time we |
280 |
# ran TOOLCHAIN_SETUP_VISUAL_STUDIO_ENV. |
|
281 |
PATH="$VS_PATH" |
|
282 |
# The microsoft toolchain also requires INCLUDE and LIB to be set. |
|
283 |
export INCLUDE="$VS_INCLUDE" |
|
284 |
export LIB="$VS_LIB" |
|
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34102
diff
changeset
|
285 |
else |
35747 | 286 |
if test "x$XCODE_VERSION_OUTPUT" != x; then |
287 |
# For Xcode, we set the Xcode version as TOOLCHAIN_VERSION |
|
288 |
TOOLCHAIN_VERSION=`$ECHO $XCODE_VERSION_OUTPUT | $CUT -f 2 -d ' '` |
|
289 |
TOOLCHAIN_DESCRIPTION="$TOOLCHAIN_DESCRIPTION from Xcode" |
|
290 |
else |
|
291 |
# Currently we do not define this for other toolchains. This might change as the need arise. |
|
292 |
TOOLCHAIN_VERSION= |
|
293 |
fi |
|
22724
072f729936a9
8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents:
22721
diff
changeset
|
294 |
fi |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34102
diff
changeset
|
295 |
AC_SUBST(TOOLCHAIN_VERSION) |
22724
072f729936a9
8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents:
22721
diff
changeset
|
296 |
|
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
297 |
# Finally add TOOLCHAIN_PATH at the beginning, to allow --with-tools-dir to |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
298 |
# override all other locations. |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23161
diff
changeset
|
299 |
if test "x$TOOLCHAIN_PATH" != x; then |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23161
diff
changeset
|
300 |
PATH=$TOOLCHAIN_PATH:$PATH |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
301 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
302 |
]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
303 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
304 |
# Restore path, etc |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
305 |
AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION], |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
306 |
[ |
39928
8448cfeb0f1d
8079788: Fix broken CL version detection in configure for some Visual Studio configurations
erikj
parents:
39115
diff
changeset
|
307 |
# Restore old path, except for the microsoft toolchain, which requires VS_PATH |
8448cfeb0f1d
8079788: Fix broken CL version detection in configure for some Visual Studio configurations
erikj
parents:
39115
diff
changeset
|
308 |
# to remain in place. Otherwise the compiler will not work in some siutations |
8448cfeb0f1d
8079788: Fix broken CL version detection in configure for some Visual Studio configurations
erikj
parents:
39115
diff
changeset
|
309 |
# in later configure checks. |
8448cfeb0f1d
8079788: Fix broken CL version detection in configure for some Visual Studio configurations
erikj
parents:
39115
diff
changeset
|
310 |
if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then |
8448cfeb0f1d
8079788: Fix broken CL version detection in configure for some Visual Studio configurations
erikj
parents:
39115
diff
changeset
|
311 |
PATH="$OLD_PATH" |
8448cfeb0f1d
8079788: Fix broken CL version detection in configure for some Visual Studio configurations
erikj
parents:
39115
diff
changeset
|
312 |
fi |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
313 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
314 |
# Restore the flags to the user specified values. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
315 |
# This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
316 |
CFLAGS="$ORG_CFLAGS" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
317 |
CXXFLAGS="$ORG_CXXFLAGS" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
318 |
]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
319 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
320 |
# Check if a compiler is of the toolchain type we expect, and save the version |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
321 |
# information from it. If the compiler does not match the expected type, |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
322 |
# this function will abort using AC_MSG_ERROR. If it matches, the version will |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
323 |
# be stored in CC_VERSION_NUMBER/CXX_VERSION_NUMBER (as a dotted number), and |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
324 |
# the full version string in CC_VERSION_STRING/CXX_VERSION_STRING. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
325 |
# |
14111 | 326 |
# $1 = compiler to test (CC or CXX) |
327 |
# $2 = human readable name of compiler (C or C++) |
|
35747 | 328 |
AC_DEFUN([TOOLCHAIN_EXTRACT_COMPILER_VERSION], |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
329 |
[ |
14111 | 330 |
COMPILER=[$]$1 |
331 |
COMPILER_NAME=$2 |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
332 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
333 |
if test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
334 |
# cc -V output typically looks like |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
335 |
# cc: Sun C 5.12 Linux_i386 2011/11/16 |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
336 |
COMPILER_VERSION_OUTPUT=`$COMPILER -V 2>&1` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
337 |
# Check that this is likely to be the Solaris Studio cc. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
338 |
$ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "^.*: Sun $COMPILER_NAME" > /dev/null |
14111 | 339 |
if test $? -ne 0; then |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
340 |
ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
341 |
AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
342 |
AC_MSG_NOTICE([The result from running with -V was: "$COMPILER_VERSION_OUTPUT"]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
343 |
AC_MSG_NOTICE([The result from running with --version was: "$ALT_VERSION_OUTPUT"]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
344 |
AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.]) |
14111 | 345 |
fi |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
346 |
# Remove usage instructions (if present), and |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
347 |
# collapse compiler output into a single line |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
348 |
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
349 |
$SED -e 's/ *@<:@Uu@:>@sage:.*//'` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
350 |
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
351 |
$SED -e "s/^.*@<:@ ,\t@:>@$COMPILER_NAME@<:@ ,\t@:>@\(@<:@1-9@:>@\.@<:@0-9@:>@@<:@0-9@:>@*\).*/\1/"` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
352 |
elif test "x$TOOLCHAIN_TYPE" = xxlc; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
353 |
# xlc -qversion output typically looks like |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
354 |
# IBM XL C/C++ for AIX, V11.1 (5724-X13) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
355 |
# Version: 11.01.0000.0015 |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
356 |
COMPILER_VERSION_OUTPUT=`$COMPILER -qversion 2>&1` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
357 |
# Check that this is likely to be the IBM XL C compiler. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
358 |
$ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "IBM XL C" > /dev/null |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
359 |
if test $? -ne 0; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
360 |
ALT_VERSION_OUTPUT=`$COMPILER --version 2>&1` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
361 |
AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
362 |
AC_MSG_NOTICE([The result from running with -qversion was: "$COMPILER_VERSION_OUTPUT"]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
363 |
AC_MSG_NOTICE([The result from running with --version was: "$ALT_VERSION_OUTPUT"]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
364 |
AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
365 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
366 |
# Collapse compiler output into a single line |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
367 |
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
368 |
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
369 |
$SED -e 's/^.*, V\(@<:@1-9@:>@@<:@0-9.@:>@*\).*$/\1/'` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
370 |
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
371 |
# There is no specific version flag, but all output starts with a version string. |
14111 | 372 |
# First line typically looks something like: |
20362
5f8289bfda3e
8023611: Win32 and win64: Remove all the WARNINGS in JDK 8 builds for Windows 2008 and MSVS 2010 SP1
tbell
parents:
19763
diff
changeset
|
373 |
# Microsoft (R) 32-bit C/C++ Optimizing Compiler Version 16.00.40219.01 for 80x86 |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
374 |
COMPILER_VERSION_OUTPUT=`$COMPILER 2>&1 | $HEAD -n 1 | $TR -d '\r'` |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
375 |
# Check that this is likely to be Microsoft CL.EXE. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
376 |
$ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Microsoft.*Compiler" > /dev/null |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
377 |
if test $? -ne 0; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
378 |
AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
379 |
AC_MSG_NOTICE([The result from running it was: "$COMPILER_VERSION_OUTPUT"]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
380 |
AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.]) |
14111 | 381 |
fi |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
382 |
# Collapse compiler output into a single line |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
383 |
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
384 |
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
385 |
$SED -e 's/^.*ersion.\(@<:@1-9@:>@@<:@0-9.@:>@*\) .*$/\1/'` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
386 |
elif test "x$TOOLCHAIN_TYPE" = xgcc; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
387 |
# gcc --version output typically looks like |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
388 |
# gcc (Ubuntu/Linaro 4.8.1-10ubuntu9) 4.8.1 |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
389 |
# Copyright (C) 2013 Free Software Foundation, Inc. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
390 |
# This is free software; see the source for copying conditions. There is NO |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
391 |
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
392 |
COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1` |
14111 | 393 |
# Check that this is likely to be GCC. |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
394 |
$ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "Free Software Foundation" > /dev/null |
14111 | 395 |
if test $? -ne 0; then |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
396 |
AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
397 |
AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION"]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
398 |
AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.]) |
13697 | 399 |
fi |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
400 |
# Remove Copyright and legalese from version string, and |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
401 |
# collapse into a single line |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
402 |
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
403 |
$SED -e 's/ *Copyright .*//'` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
404 |
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
36535
141db8da8c18
8151841: Build needs additional flags to compile with GCC 6
andrew
parents:
35747
diff
changeset
|
405 |
$SED -e 's/^.* \(@<:@1-9@:>@\.@<:@0-9.@:>@*\)@<:@^0-9.@:>@.*$/\1/'` |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
406 |
elif test "x$TOOLCHAIN_TYPE" = xclang; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
407 |
# clang --version output typically looks like |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
408 |
# Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
409 |
# clang version 3.3 (tags/RELEASE_33/final) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
410 |
# or |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
411 |
# Debian clang version 3.2-7ubuntu1 (tags/RELEASE_32/final) (based on LLVM 3.2) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
412 |
# Target: x86_64-pc-linux-gnu |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
413 |
# Thread model: posix |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
414 |
COMPILER_VERSION_OUTPUT=`$COMPILER --version 2>&1` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
415 |
# Check that this is likely to be clang |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
416 |
$ECHO "$COMPILER_VERSION_OUTPUT" | $GREP "clang" > /dev/null |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
417 |
if test $? -ne 0; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
418 |
AC_MSG_NOTICE([The $COMPILER_NAME compiler (located as $COMPILER) does not seem to be the required $TOOLCHAIN_TYPE compiler.]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
419 |
AC_MSG_NOTICE([The result from running with --version was: "$COMPILER_VERSION_OUTPUT"]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
420 |
AC_MSG_ERROR([A $TOOLCHAIN_TYPE compiler is required. Try setting --with-tools-dir.]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
421 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
422 |
# Collapse compiler output into a single line |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
423 |
COMPILER_VERSION_STRING=`$ECHO $COMPILER_VERSION_OUTPUT` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
424 |
COMPILER_VERSION_NUMBER=`$ECHO $COMPILER_VERSION_OUTPUT | \ |
35747 | 425 |
$SED -e 's/^.* version \(@<:@1-9@:>@@<:@0-9.@:>@*\).*$/\1/'` |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
426 |
else |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
427 |
AC_MSG_ERROR([Unknown toolchain type $TOOLCHAIN_TYPE.]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
428 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
429 |
# This sets CC_VERSION_NUMBER or CXX_VERSION_NUMBER. (This comment is a grep marker) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
430 |
$1_VERSION_NUMBER="$COMPILER_VERSION_NUMBER" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
431 |
# This sets CC_VERSION_STRING or CXX_VERSION_STRING. (This comment is a grep marker) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
432 |
$1_VERSION_STRING="$COMPILER_VERSION_STRING" |
17664
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
433 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
434 |
AC_MSG_NOTICE([Using $TOOLCHAIN_TYPE $COMPILER_NAME compiler version $COMPILER_VERSION_NUMBER @<:@$COMPILER_VERSION_STRING@:>@]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
435 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
436 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
437 |
# Try to locate the given C or C++ compiler in the path, or otherwise. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
438 |
# |
14111 | 439 |
# $1 = compiler to test (CC or CXX) |
440 |
# $2 = human readable name of compiler (C or C++) |
|
441 |
# $3 = list of compiler names to search for |
|
442 |
AC_DEFUN([TOOLCHAIN_FIND_COMPILER], |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
443 |
[ |
14111 | 444 |
COMPILER_NAME=$2 |
22458
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
445 |
SEARCH_LIST="$3" |
14111 | 446 |
|
22458
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
447 |
if test "x[$]$1" != x; then |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
448 |
# User has supplied compiler name already, always let that override. |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
449 |
AC_MSG_NOTICE([Will use user supplied compiler $1=[$]$1]) |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
450 |
if test "x`basename [$]$1`" = "x[$]$1"; then |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
451 |
# A command without a complete path is provided, search $PATH. |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
452 |
|
22458
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
453 |
AC_PATH_PROGS(POTENTIAL_$1, [$]$1) |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
454 |
if test "x$POTENTIAL_$1" != x; then |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
455 |
$1=$POTENTIAL_$1 |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
456 |
else |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
457 |
AC_MSG_ERROR([User supplied compiler $1=[$]$1 could not be found]) |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
458 |
fi |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
459 |
else |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
460 |
# Otherwise it might already be a complete path |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
461 |
if test ! -x "[$]$1"; then |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
462 |
AC_MSG_ERROR([User supplied compiler $1=[$]$1 does not exist]) |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
463 |
fi |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
464 |
fi |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
465 |
else |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
466 |
# No user supplied value. Locate compiler ourselves. |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
467 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
468 |
# If we are cross compiling, assume cross compilation tools follows the |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
469 |
# cross compilation standard where they are prefixed with the autoconf |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
470 |
# standard name for the target. For example the binary |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
471 |
# i686-sun-solaris2.10-gcc will cross compile for i686-sun-solaris2.10. |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
472 |
# If we are not cross compiling, then the default compiler name will be |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
473 |
# used. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
474 |
|
22458
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
475 |
$1= |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23161
diff
changeset
|
476 |
# If TOOLCHAIN_PATH is set, check for all compiler names in there first |
22458
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
477 |
# before checking the rest of the PATH. |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
478 |
# FIXME: Now that we prefix the TOOLS_DIR to the PATH in the PRE_DETECTION |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
479 |
# step, this should not be necessary. |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23161
diff
changeset
|
480 |
if test -n "$TOOLCHAIN_PATH"; then |
22458
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
481 |
PATH_save="$PATH" |
23428
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23161
diff
changeset
|
482 |
PATH="$TOOLCHAIN_PATH" |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23161
diff
changeset
|
483 |
AC_PATH_PROGS(TOOLCHAIN_PATH_$1, $SEARCH_LIST) |
3c8a05bf4656
8038340: Cleanup and fix sysroot and devkit handling on Linux and Solaris
erikj
parents:
23161
diff
changeset
|
484 |
$1=$TOOLCHAIN_PATH_$1 |
22458
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
485 |
PATH="$PATH_save" |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
486 |
fi |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
487 |
|
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
488 |
# AC_PATH_PROGS can't be run multiple times with the same variable, |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
489 |
# so create a new name for this run. |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
490 |
if test "x[$]$1" = x; then |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
491 |
AC_PATH_PROGS(POTENTIAL_$1, $SEARCH_LIST) |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
492 |
$1=$POTENTIAL_$1 |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
493 |
fi |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
494 |
|
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
495 |
if test "x[$]$1" = x; then |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
496 |
HELP_MSG_MISSING_DEPENDENCY([devkit]) |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
497 |
AC_MSG_ERROR([Could not find a $COMPILER_NAME compiler. $HELP_MSG]) |
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
498 |
fi |
14614
3bb0a6b81bb9
8003945: build-infra: problems finding compiler when using --with-dev-kit
erikj
parents:
14467
diff
changeset
|
499 |
fi |
3bb0a6b81bb9
8003945: build-infra: problems finding compiler when using --with-dev-kit
erikj
parents:
14467
diff
changeset
|
500 |
|
22458
6a74da13c52f
8022411: Allow overriding of CXX and CC with absolute path
ihse
parents:
22179
diff
changeset
|
501 |
# Now we have a compiler binary in $1. Make sure it's okay. |
14111 | 502 |
BASIC_FIXUP_EXECUTABLE($1) |
503 |
TEST_COMPILER="[$]$1" |
|
504 |
||
35371
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
505 |
AC_MSG_CHECKING([resolved symbolic links for $1]) |
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
506 |
SYMLINK_ORIGINAL="$TEST_COMPILER" |
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
507 |
BASIC_REMOVE_SYMBOLIC_LINKS(SYMLINK_ORIGINAL) |
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
508 |
if test "x$TEST_COMPILER" = "x$SYMLINK_ORIGINAL"; then |
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
509 |
AC_MSG_RESULT([no symlink]) |
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
510 |
else |
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
511 |
AC_MSG_RESULT([$SYMLINK_ORIGINAL]) |
14111 | 512 |
|
35371
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
513 |
# We can't handle ccache by gcc wrappers, since we need to know if we're |
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
514 |
# using ccache. Instead ccache usage must be controlled by a configure option. |
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
515 |
COMPILER_BASENAME=`$BASENAME "$SYMLINK_ORIGINAL"` |
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
516 |
if test "x$COMPILER_BASENAME" = "xccache"; then |
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
517 |
AC_MSG_NOTICE([Please use --enable-ccache instead of providing a wrapped compiler.]) |
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
518 |
AC_MSG_ERROR([$TEST_COMPILER is a symbolic link to ccache. This is not supported.]) |
7deccee1f94e
8148351: Only display resolved symlink for compiler, do not change path
ihse
parents:
34923
diff
changeset
|
519 |
fi |
14111 | 520 |
fi |
22179
59d2bd4620b0
8031668: TOOLCHAIN_FIND_COMPILER unexpectedly resolves symbolic links
mduigou
parents:
22035
diff
changeset
|
521 |
|
35747 | 522 |
TOOLCHAIN_EXTRACT_COMPILER_VERSION([$1], [$COMPILER_NAME]) |
14111 | 523 |
]) |
524 |
||
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
525 |
# Detect the core components of the toolchain, i.e. the compilers (CC and CXX), |
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
526 |
# preprocessor (CPP and CXXCPP), the linker (LD), the assembler (AS) and the |
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
527 |
# archiver (AR). Verify that the compilers are correct according to the |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
528 |
# toolchain type. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
529 |
AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_CORE], |
14111 | 530 |
[ |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
531 |
# |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
532 |
# Setup the compilers (CC and CXX) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
533 |
# |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
534 |
TOOLCHAIN_FIND_COMPILER([CC], [C], $TOOLCHAIN_CC_BINARY) |
20363 | 535 |
# Now that we have resolved CC ourself, let autoconf have its go at it |
536 |
AC_PROG_CC([$CC]) |
|
14111 | 537 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
538 |
TOOLCHAIN_FIND_COMPILER([CXX], [C++], $TOOLCHAIN_CXX_BINARY) |
20363 | 539 |
# Now that we have resolved CXX ourself, let autoconf have its go at it |
540 |
AC_PROG_CXX([$CXX]) |
|
14111 | 541 |
|
35747 | 542 |
# This is the compiler version number on the form X.Y[.Z] |
543 |
AC_SUBST(CC_VERSION_NUMBER) |
|
544 |
AC_SUBST(CXX_VERSION_NUMBER) |
|
545 |
||
546 |
TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS |
|
547 |
||
548 |
if test "x$TOOLCHAIN_MINIMUM_VERSION" != x; then |
|
549 |
TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: $TOOLCHAIN_MINIMUM_VERSION, |
|
550 |
IF_OLDER_THAN: [ |
|
551 |
AC_MSG_WARN([You are using $TOOLCHAIN_TYPE older than $TOOLCHAIN_MINIMUM_VERSION. This is not a supported configuration.]) |
|
552 |
] |
|
553 |
) |
|
554 |
fi |
|
555 |
||
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
556 |
# |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
557 |
# Setup the preprocessor (CPP and CXXCPP) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
558 |
# |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
559 |
AC_PROG_CPP |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
560 |
BASIC_FIXUP_EXECUTABLE(CPP) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
561 |
AC_PROG_CXXCPP |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
562 |
BASIC_FIXUP_EXECUTABLE(CXXCPP) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
563 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
564 |
# |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
565 |
# Setup the linker (LD) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
566 |
# |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
567 |
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
568 |
# In the Microsoft toolchain we have a separate LD command "link". |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
569 |
# Make sure we reject /usr/bin/link (as determined in CYGWIN_LINK), which is |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
570 |
# a cygwin program for something completely different. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
571 |
AC_CHECK_PROG([LD], [link],[link],,, [$CYGWIN_LINK]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
572 |
BASIC_FIXUP_EXECUTABLE(LD) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
573 |
# Verify that we indeed succeeded with this trick. |
13697 | 574 |
AC_MSG_CHECKING([if the found link.exe is actually the Visual Studio linker]) |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
575 |
"$LD" --version > /dev/null |
13697 | 576 |
if test $? -eq 0 ; then |
577 |
AC_MSG_RESULT([no]) |
|
578 |
AC_MSG_ERROR([This is the Cygwin link tool. Please check your PATH and rerun configure.]) |
|
579 |
else |
|
580 |
AC_MSG_RESULT([yes]) |
|
581 |
fi |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
582 |
LDCXX="$LD" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
583 |
else |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
584 |
# All other toolchains use the compiler to link. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
585 |
LD="$CC" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
586 |
LDCXX="$CXX" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
587 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
588 |
AC_SUBST(LD) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
589 |
# FIXME: it should be CXXLD, according to standard (cf CXXCPP) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
590 |
AC_SUBST(LDCXX) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
591 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
592 |
# |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
593 |
# Setup the assembler (AS) |
20363 | 594 |
# |
595 |
if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
|
22475 | 596 |
BASIC_PATH_PROGS(AS, as) |
14111 | 597 |
BASIC_FIXUP_EXECUTABLE(AS) |
39115
1f71a5d2b20b
8081676: Verify that configure detects AS on Solaris and print help otherwise
tbell
parents:
38843
diff
changeset
|
598 |
if test "x$AS" = x; then |
1f71a5d2b20b
8081676: Verify that configure detects AS on Solaris and print help otherwise
tbell
parents:
38843
diff
changeset
|
599 |
AC_MSG_ERROR([Solaris assembler (as) is required. Please install via "pkg install pkg:/developer/assembler".]) |
1f71a5d2b20b
8081676: Verify that configure detects AS on Solaris and print help otherwise
tbell
parents:
38843
diff
changeset
|
600 |
fi |
20363 | 601 |
else |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
602 |
# FIXME: is this correct for microsoft? |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
603 |
AS="$CC -c" |
20363 | 604 |
fi |
605 |
AC_SUBST(AS) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
606 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
607 |
# |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
608 |
# Setup the archiver (AR) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
609 |
# |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
610 |
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
611 |
# The corresponding ar tool is lib.exe (used to create static libraries) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
612 |
AC_CHECK_PROG([AR], [lib],[lib],,,) |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
613 |
elif test "x$TOOLCHAIN_TYPE" = xgcc; then |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
614 |
BASIC_CHECK_TOOLS(AR, ar gcc-ar) |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
615 |
else |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
616 |
BASIC_CHECK_TOOLS(AR, ar) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
617 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
618 |
BASIC_FIXUP_EXECUTABLE(AR) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
619 |
]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
620 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
621 |
# Setup additional tools that is considered a part of the toolchain, but not the |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
622 |
# core part. Many of these are highly platform-specific and do not exist, |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
623 |
# and/or are not needed on all platforms. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
624 |
AC_DEFUN_ONCE([TOOLCHAIN_DETECT_TOOLCHAIN_EXTRA], |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
625 |
[ |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
626 |
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
627 |
BASIC_PATH_PROGS(LIPO, lipo) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
628 |
BASIC_FIXUP_EXECUTABLE(LIPO) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
629 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
630 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
631 |
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
632 |
AC_CHECK_PROG([MT], [mt], [mt],,, [/usr/bin/mt]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
633 |
BASIC_FIXUP_EXECUTABLE(MT) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
634 |
# Setup the resource compiler (RC) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
635 |
AC_CHECK_PROG([RC], [rc], [rc],,, [/usr/bin/rc]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
636 |
BASIC_FIXUP_EXECUTABLE(RC) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
637 |
AC_CHECK_PROG([DUMPBIN], [dumpbin], [dumpbin],,,) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
638 |
BASIC_FIXUP_EXECUTABLE(DUMPBIN) |
26400
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25034
diff
changeset
|
639 |
# We need to check for 'msbuild.exe' because at the place where we expect to |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25034
diff
changeset
|
640 |
# find 'msbuild.exe' there's also a directory called 'msbuild' and configure |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25034
diff
changeset
|
641 |
# won't find the 'msbuild.exe' executable in that case (and the |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25034
diff
changeset
|
642 |
# 'ac_executable_extensions' is unusable due to performance reasons). |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25034
diff
changeset
|
643 |
# Notice that we intentionally don't fix up the path to MSBUILD because we |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25034
diff
changeset
|
644 |
# will call it in a DOS shell during freetype detection on Windows (see |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25034
diff
changeset
|
645 |
# 'LIB_SETUP_FREETYPE' in "libraries.m4" |
4d6c6f2df610
8057538: Build the freetype library during configure on Windows
simonis
parents:
25034
diff
changeset
|
646 |
AC_CHECK_PROG([MSBUILD], [msbuild.exe], [msbuild.exe],,,) |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
647 |
fi |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
648 |
|
20363 | 649 |
if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
650 |
BASIC_PATH_PROGS(STRIP, strip) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
651 |
BASIC_FIXUP_EXECUTABLE(STRIP) |
22475 | 652 |
BASIC_PATH_PROGS(NM, nm) |
14111 | 653 |
BASIC_FIXUP_EXECUTABLE(NM) |
22475 | 654 |
BASIC_PATH_PROGS(GNM, gnm) |
16582
61f0b8f48036
8006288: build-infra: Use solaris nm and not gnm on solaris
erikj
parents:
15912
diff
changeset
|
655 |
BASIC_FIXUP_EXECUTABLE(GNM) |
20363 | 656 |
elif test "x$OPENJDK_TARGET_OS" != xwindows; then |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
657 |
# FIXME: we should unify this with the solaris case above. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
658 |
BASIC_CHECK_TOOLS(STRIP, strip) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
659 |
BASIC_FIXUP_EXECUTABLE(STRIP) |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
660 |
if test "x$TOOLCHAIN_TYPE" = xgcc; then |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
661 |
BASIC_CHECK_TOOLS(NM, nm gcc-nm) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
662 |
else |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
663 |
BASIC_CHECK_TOOLS(NM, nm) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
664 |
fi |
14111 | 665 |
BASIC_FIXUP_EXECUTABLE(NM) |
16582
61f0b8f48036
8006288: build-infra: Use solaris nm and not gnm on solaris
erikj
parents:
15912
diff
changeset
|
666 |
GNM="$NM" |
61f0b8f48036
8006288: build-infra: Use solaris nm and not gnm on solaris
erikj
parents:
15912
diff
changeset
|
667 |
AC_SUBST(GNM) |
20363 | 668 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
669 |
|
20363 | 670 |
# objcopy is used for moving debug symbols to separate files when |
671 |
# full debug symbols are enabled. |
|
672 |
if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then |
|
22475 | 673 |
BASIC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy]) |
14464
b82a851468d0
8003300: build-infra: fails on solaris when objcopy is not found
tbell
parents:
14112
diff
changeset
|
674 |
# Only call fixup if objcopy was found. |
b82a851468d0
8003300: build-infra: fails on solaris when objcopy is not found
tbell
parents:
14112
diff
changeset
|
675 |
if test -n "$OBJCOPY"; then |
20363 | 676 |
BASIC_FIXUP_EXECUTABLE(OBJCOPY) |
32462
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
677 |
if test "x$OPENJDK_BUILD_OS" = xsolaris; then |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
678 |
# objcopy prior to 2.21.1 on solaris is broken and is not usable. |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
679 |
# Rewrite objcopy version output to VALID_VERSION or BAD_VERSION. |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
680 |
# - version number is last blank separate word on first line |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
681 |
# - version number formats that have been seen: |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
682 |
# - <major>.<minor> |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
683 |
# - <major>.<minor>.<micro> |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
684 |
OBJCOPY_VERSION=`$OBJCOPY --version | $HEAD -n 1` |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
685 |
# The outer [ ] is to prevent m4 from eating the [] in the sed expression. |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
686 |
[ OBJCOPY_VERSION_CHECK=`$ECHO $OBJCOPY_VERSION | $SED -n \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
687 |
-e 's/.* //' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
688 |
-e '/^[01]\./b bad' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
689 |
-e '/^2\./{' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
690 |
-e ' s/^2\.//' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
691 |
-e ' /^[0-9]$/b bad' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
692 |
-e ' /^[0-9]\./b bad' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
693 |
-e ' /^1[0-9]$/b bad' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
694 |
-e ' /^1[0-9]\./b bad' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
695 |
-e ' /^20\./b bad' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
696 |
-e ' /^21\.0$/b bad' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
697 |
-e ' /^21\.0\./b bad' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
698 |
-e '}' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
699 |
-e ':good' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
700 |
-e 's/.*/VALID_VERSION/p' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
701 |
-e 'q' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
702 |
-e ':bad' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
703 |
-e 's/.*/BAD_VERSION/p' \ |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
704 |
-e 'q'` ] |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
705 |
if test "x$OBJCOPY_VERSION_CHECK" = xBAD_VERSION; then |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
706 |
OBJCOPY= |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
707 |
AC_MSG_WARN([Ignoring found objcopy since it is broken (prior to 2.21.1). No debug symbols will be generated.]) |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
708 |
AC_MSG_NOTICE([objcopy reports version $OBJCOPY_VERSION]) |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
709 |
AC_MSG_NOTICE([Note: patch 149063-01 or newer contains the correct Solaris 10 SPARC version]) |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
710 |
AC_MSG_NOTICE([Note: patch 149064-01 or newer contains the correct Solaris 10 X86 version]) |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
711 |
AC_MSG_NOTICE([Note: Solaris 11 Update 1 contains the correct version]) |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
712 |
fi |
f236112ab3d0
8064808: Disable use of broken objcopy on Solaris, remove adhoc helper tools
ihse
parents:
30096
diff
changeset
|
713 |
fi |
14464
b82a851468d0
8003300: build-infra: fails on solaris when objcopy is not found
tbell
parents:
14112
diff
changeset
|
714 |
fi |
20363 | 715 |
fi |
14111 | 716 |
|
22475 | 717 |
BASIC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump]) |
20363 | 718 |
if test "x$OBJDUMP" != x; then |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
719 |
# Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
720 |
# bails if argument is missing. |
20363 | 721 |
BASIC_FIXUP_EXECUTABLE(OBJDUMP) |
722 |
fi |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
723 |
]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
724 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
725 |
# Setup the build tools (i.e, the compiler and linker used to build programs |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
726 |
# that should be run on the build platform, not the target platform, as a build |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
727 |
# helper). Since the non-cross-compile case uses the normal, target compilers |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
728 |
# for this, we can only do this after these have been setup. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
729 |
AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS], |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
730 |
[ |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
731 |
if test "x$COMPILE_TYPE" = "xcross"; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
732 |
# Now we need to find a C/C++ compiler that can build executables for the |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
733 |
# build platform. We can't use the AC_PROG_CC macro, since it can only be |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
734 |
# used once. Also, we need to do this without adding a tools dir to the |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
735 |
# path, otherwise we might pick up cross-compilers which don't use standard |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
736 |
# naming. |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
737 |
|
33395
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
738 |
OLDPATH="$PATH" |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
739 |
|
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
740 |
AC_ARG_WITH(build-devkit, [AS_HELP_STRING([--with-build-devkit], |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
741 |
[Devkit to use for the build platform toolchain])]) |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
742 |
if test "x$with_build_devkit" = "xyes"; then |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
743 |
AC_MSG_ERROR([--with-build-devkit must have a value]) |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
744 |
elif test -n "$with_build_devkit"; then |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
745 |
if test ! -d "$with_build_devkit"; then |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
746 |
AC_MSG_ERROR([--with-build-devkit points to non existing dir: $with_build_devkit]) |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
747 |
else |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
748 |
BASIC_FIXUP_PATH([with_build_devkit]) |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
749 |
BUILD_DEVKIT_ROOT="$with_build_devkit" |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
750 |
# Check for a meta data info file in the root of the devkit |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
751 |
if test -f "$BUILD_DEVKIT_ROOT/devkit.info"; then |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
752 |
# Process devkit.info so that existing devkit variables are not |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
753 |
# modified by this |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
754 |
$SED -e "s/^DEVKIT_/BUILD_DEVKIT_/g" \ |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
755 |
-e "s/\$DEVKIT_ROOT/\$BUILD_DEVKIT_ROOT/g" \ |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
756 |
-e "s/\$host/\$build/g" \ |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
757 |
$BUILD_DEVKIT_ROOT/devkit.info \ |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
758 |
> $CONFIGURESUPPORT_OUTPUTDIR/build-devkit.info |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
759 |
. $CONFIGURESUPPORT_OUTPUTDIR/build-devkit.info |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
760 |
# This potentially sets the following: |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
761 |
# A descriptive name of the devkit |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
762 |
BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_NAME]) |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
763 |
# Corresponds to --with-extra-path |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
764 |
BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_EXTRA_PATH]) |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
765 |
# Corresponds to --with-toolchain-path |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
766 |
BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_TOOLCHAIN_PATH]) |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
767 |
# Corresponds to --with-sysroot |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
768 |
BASIC_EVAL_DEVKIT_VARIABLE([BUILD_DEVKIT_SYSROOT]) |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
769 |
# Skip the Window specific parts |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
770 |
fi |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
771 |
|
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
772 |
AC_MSG_CHECKING([for build platform devkit]) |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
773 |
if test "x$BUILD_DEVKIT_NAME" != x; then |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
774 |
AC_MSG_RESULT([$BUILD_DEVKIT_NAME in $BUILD_DEVKIT_ROOT]) |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
775 |
else |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
776 |
AC_MSG_RESULT([$BUILD_DEVKIT_ROOT]) |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
777 |
fi |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
778 |
|
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
779 |
BUILD_SYSROOT="$BUILD_DEVKIT_SYSROOT" |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
780 |
FLAGS_SETUP_SYSROOT_FLAGS([BUILD_]) |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
781 |
|
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
782 |
# Fallback default of just /bin if DEVKIT_PATH is not defined |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
783 |
if test "x$BUILD_DEVKIT_TOOLCHAIN_PATH" = x; then |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
784 |
BUILD_DEVKIT_TOOLCHAIN_PATH="$BUILD_DEVKIT_ROOT/bin" |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
785 |
fi |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
786 |
PATH="$BUILD_DEVKIT_TOOLCHAIN_PATH:$BUILD_DEVKIT_EXTRA_PATH" |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
787 |
fi |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
788 |
fi |
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
789 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
790 |
# FIXME: we should list the discovered compilers as an exclude pattern! |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
791 |
# If we do that, we can do this detection before POST_DETECTION, and still |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
792 |
# find the build compilers in the tools dir, if needed. |
33395
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
793 |
BASIC_REQUIRE_PROGS(BUILD_CC, [cl cc gcc]) |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
794 |
BASIC_FIXUP_EXECUTABLE(BUILD_CC) |
33395
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
795 |
BASIC_REQUIRE_PROGS(BUILD_CXX, [cl CC g++]) |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
796 |
BASIC_FIXUP_EXECUTABLE(BUILD_CXX) |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
797 |
BASIC_PATH_PROGS(BUILD_NM, nm gcc-nm) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
798 |
BASIC_FIXUP_EXECUTABLE(BUILD_NM) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
799 |
BASIC_PATH_PROGS(BUILD_AR, ar gcc-ar) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
800 |
BASIC_FIXUP_EXECUTABLE(BUILD_AR) |
36506 | 801 |
BASIC_PATH_PROGS(BUILD_OBJCOPY, objcopy) |
802 |
BASIC_FIXUP_EXECUTABLE(BUILD_OBJCOPY) |
|
803 |
BASIC_PATH_PROGS(BUILD_STRIP, strip) |
|
804 |
BASIC_FIXUP_EXECUTABLE(BUILD_STRIP) |
|
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
805 |
# Assume the C compiler is the assembler |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
806 |
BUILD_AS="$BUILD_CC -c" |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
807 |
# Just like for the target compiler, use the compiler as linker |
33395
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
808 |
BUILD_LD="$BUILD_CC" |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34102
diff
changeset
|
809 |
BUILD_LDCXX="$BUILD_CXX" |
33395
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
810 |
|
5907d5b1287c
8140593: Add configure parameter for devkit for the build compiler
erikj
parents:
32810
diff
changeset
|
811 |
PATH="$OLDPATH" |
37864
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
812 |
|
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
813 |
TOOLCHAIN_EXTRACT_COMPILER_VERSION(BUILD_CC, [BuildC]) |
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
814 |
TOOLCHAIN_EXTRACT_COMPILER_VERSION(BUILD_CXX, [BuildC++]) |
5284b5a9fdc7
8155587: Cross compilation may cause compiler warnings for "build" compiler
erikj
parents:
37402
diff
changeset
|
815 |
TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS([BUILD_], [OPENJDK_BUILD_]) |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
816 |
else |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
817 |
# If we are not cross compiling, use the normal target compilers for |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
818 |
# building the build platform executables. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
819 |
BUILD_CC="$CC" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
820 |
BUILD_CXX="$CXX" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
821 |
BUILD_LD="$LD" |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34102
diff
changeset
|
822 |
BUILD_LDCXX="$LDCXX" |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
823 |
BUILD_NM="$NM" |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
824 |
BUILD_AS="$AS" |
36506 | 825 |
BUILD_OBJCOPY="$OBJCOPY" |
826 |
BUILD_STRIP="$STRIP" |
|
32810
8203e52cd373
8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents:
32462
diff
changeset
|
827 |
BUILD_SYSROOT_CFLAGS="$SYSROOT_CFLAGS" |
8203e52cd373
8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents:
32462
diff
changeset
|
828 |
BUILD_SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS" |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
829 |
BUILD_AR="$AR" |
39936
552923792fd8
8156980: Hotspot build doesn't have -std=gnu++98 gcc option
andrew
parents:
39115
diff
changeset
|
830 |
|
552923792fd8
8156980: Hotspot build doesn't have -std=gnu++98 gcc option
andrew
parents:
39115
diff
changeset
|
831 |
TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS([], [OPENJDK_BUILD_]) |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
832 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
833 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
834 |
AC_SUBST(BUILD_CC) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
835 |
AC_SUBST(BUILD_CXX) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
836 |
AC_SUBST(BUILD_LD) |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34102
diff
changeset
|
837 |
AC_SUBST(BUILD_LDCXX) |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
838 |
AC_SUBST(BUILD_NM) |
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
839 |
AC_SUBST(BUILD_AS) |
32810
8203e52cd373
8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents:
32462
diff
changeset
|
840 |
AC_SUBST(BUILD_SYSROOT_CFLAGS) |
8203e52cd373
8138694: Devkit build on Macosx still requires Xcode to be installed
erikj
parents:
32462
diff
changeset
|
841 |
AC_SUBST(BUILD_SYSROOT_LDFLAGS) |
34102
c0a98357f847
8143141: Bring in minor build changes from the jigsaw/jake forest
erikj
parents:
33568
diff
changeset
|
842 |
AC_SUBST(BUILD_AR) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
843 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
844 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
845 |
# Setup legacy variables that are still needed as alternative ways to refer to |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
846 |
# parts of the toolchain. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
847 |
AC_DEFUN_ONCE([TOOLCHAIN_SETUP_LEGACY], |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
848 |
[ |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
849 |
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
850 |
# For hotspot, we need these in Windows mixed path, |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
851 |
# so rewrite them all. Need added .exe suffix. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
852 |
HOTSPOT_CXX="$CXX.exe" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
853 |
HOTSPOT_LD="$LD.exe" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
854 |
HOTSPOT_MT="$MT.exe" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
855 |
HOTSPOT_RC="$RC.exe" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
856 |
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_CXX) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
857 |
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_LD) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
858 |
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_MT) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
859 |
BASIC_WINDOWS_REWRITE_AS_WINDOWS_MIXED_PATH(HOTSPOT_RC) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
860 |
AC_SUBST(HOTSPOT_MT) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
861 |
AC_SUBST(HOTSPOT_RC) |
20363 | 862 |
else |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
863 |
HOTSPOT_CXX="$CXX" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
864 |
HOTSPOT_LD="$LD" |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
865 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
866 |
AC_SUBST(HOTSPOT_CXX) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
867 |
AC_SUBST(HOTSPOT_LD) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
868 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
869 |
if test "x$TOOLCHAIN_TYPE" = xclang; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
870 |
USE_CLANG=true |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
871 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
872 |
AC_SUBST(USE_CLANG) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
873 |
]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
874 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
875 |
# Do some additional checks on the detected tools. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
876 |
AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS], |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
877 |
[ |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
878 |
# The package path is used only on macosx? |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
879 |
# FIXME: clean this up, and/or move it elsewhere. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
880 |
PACKAGE_PATH=/opt/local |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
881 |
AC_SUBST(PACKAGE_PATH) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
882 |
|
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
883 |
# Check for extra potential brokenness. |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
884 |
if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
885 |
# On Windows, double-check that we got the right compiler. |
22724
072f729936a9
8035725: Must keep microsoft VS_PATH on PATH after toolchain detection
ihse
parents:
22721
diff
changeset
|
886 |
CC_VERSION_OUTPUT=`$CC 2>&1 | $HEAD -n 1 | $TR -d '\r'` |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
887 |
COMPILER_CPU_TEST=`$ECHO $CC_VERSION_OUTPUT | $SED -n "s/^.* \(.*\)$/\1/p"` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
888 |
if test "x$OPENJDK_TARGET_CPU" = "xx86"; then |
28901
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27594
diff
changeset
|
889 |
if test "x$COMPILER_CPU_TEST" != "x80x86" -a "x$COMPILER_CPU_TEST" != "xx86"; then |
5acc0ec03d06
8042707: Source changes needed to build JDK 9 with Visual Studio 2013 (VS2013)
erikj
parents:
27594
diff
changeset
|
890 |
AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "80x86" or "x86".]) |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
891 |
fi |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
892 |
elif test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
893 |
if test "x$COMPILER_CPU_TEST" != "xx64"; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
894 |
AC_MSG_ERROR([Target CPU mismatch. We are building for $OPENJDK_TARGET_CPU but CL is for "$COMPILER_CPU_TEST"; expected "x64".]) |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
895 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
896 |
fi |
20363 | 897 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
898 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
899 |
if test "x$TOOLCHAIN_TYPE" = xgcc; then |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
900 |
# If this is a --hash-style=gnu system, use --hash-style=both, why? |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
901 |
HAS_GNU_HASH=`$CC -dumpspecs 2>/dev/null | $GREP 'hash-style=gnu'` |
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
902 |
# This is later checked when setting flags. |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
903 |
|
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
904 |
# "-Og" suppported for GCC 4.8 and later |
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
905 |
CFLAG_OPTIMIZE_DEBUG_FLAG="-Og" |
34923 | 906 |
FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$CFLAG_OPTIMIZE_DEBUG_FLAG], |
907 |
IF_TRUE: [HAS_CFLAG_OPTIMIZE_DEBUG=true], |
|
908 |
IF_FALSE: [HAS_CFLAG_OPTIMIZE_DEBUG=false]) |
|
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
909 |
|
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
910 |
# "-z relro" supported in GNU binutils 2.17 and later |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34102
diff
changeset
|
911 |
LINKER_RELRO_FLAG="-Wl,-z,relro" |
34923 | 912 |
FLAGS_LINKER_CHECK_ARGUMENTS(ARGUMENT: [$LINKER_RELRO_FLAG], |
913 |
IF_TRUE: [HAS_LINKER_RELRO=true], |
|
914 |
IF_FALSE: [HAS_LINKER_RELRO=false]) |
|
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
915 |
|
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
916 |
# "-z now" supported in GNU binutils 2.11 and later |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34102
diff
changeset
|
917 |
LINKER_NOW_FLAG="-Wl,-z,now" |
34923 | 918 |
FLAGS_LINKER_CHECK_ARGUMENTS(ARGUMENT: [$LINKER_NOW_FLAG], |
919 |
IF_TRUE: [HAS_LINKER_NOW=true], |
|
920 |
IF_FALSE: [HAS_LINKER_NOW=false]) |
|
20363 | 921 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
922 |
|
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
923 |
# Check for broken SuSE 'ld' for which 'Only anonymous version tag is allowed |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
924 |
# in executable.' |
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
18020
diff
changeset
|
925 |
USING_BROKEN_SUSE_LD=no |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
926 |
if test "x$OPENJDK_TARGET_OS" = xlinux && test "x$TOOLCHAIN_TYPE" = xgcc; then |
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
18020
diff
changeset
|
927 |
AC_MSG_CHECKING([for broken SuSE 'ld' which only understands anonymous version tags in executables]) |
24911
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
928 |
$ECHO "SUNWprivate_1.1 { local: *; };" > version-script.map |
a039e17f8896
8032045: Enable compiler and linker safety switches for debug builds
mduigou
parents:
23429
diff
changeset
|
929 |
$ECHO "int main() { }" > main.c |
34596
e8328ce5b64e
8142907: Integration of minor fixes from the build-infra project
ihse
parents:
34102
diff
changeset
|
930 |
if $CXX -Wl,-version-script=version-script.map main.c 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD; then |
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
18020
diff
changeset
|
931 |
AC_MSG_RESULT(no) |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
18020
diff
changeset
|
932 |
USING_BROKEN_SUSE_LD=no |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
18020
diff
changeset
|
933 |
else |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
18020
diff
changeset
|
934 |
AC_MSG_RESULT(yes) |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
18020
diff
changeset
|
935 |
USING_BROKEN_SUSE_LD=yes |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
18020
diff
changeset
|
936 |
fi |
38843
2b141e8e916f
8158535: Configure script uses basic tools directly in many places
erikj
parents:
37864
diff
changeset
|
937 |
$RM version-script.map main.c a.out |
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
18020
diff
changeset
|
938 |
fi |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
18020
diff
changeset
|
939 |
AC_SUBST(USING_BROKEN_SUSE_LD) |
37402 | 940 |
|
941 |
# Setup hotspot lecagy names for toolchains |
|
942 |
HOTSPOT_TOOLCHAIN_TYPE=$TOOLCHAIN_TYPE |
|
943 |
if test "x$TOOLCHAIN_TYPE" = xclang; then |
|
944 |
HOTSPOT_TOOLCHAIN_TYPE=gcc |
|
945 |
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
|
946 |
HOTSPOT_TOOLCHAIN_TYPE=sparcWorks |
|
947 |
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then |
|
948 |
HOTSPOT_TOOLCHAIN_TYPE=visCPP |
|
949 |
fi |
|
950 |
AC_SUBST(HOTSPOT_TOOLCHAIN_TYPE) |
|
16987 | 951 |
]) |
17593
de6741d8a142
8007129: build-infra Add configure --with-jtreg option for location of JTREG
erikj
parents:
16988
diff
changeset
|
952 |
|
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22715
diff
changeset
|
953 |
# Setup the JTReg Regression Test Harness. |
17664
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
954 |
AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG], |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
955 |
[ |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
956 |
AC_ARG_WITH(jtreg, [AS_HELP_STRING([--with-jtreg], |
20363 | 957 |
[Regression Test Harness @<:@probed@:>@])], |
958 |
[], |
|
959 |
[with_jtreg=no]) |
|
17664
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
960 |
|
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
961 |
if test "x$with_jtreg" = xno; then |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
962 |
# jtreg disabled |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
963 |
AC_MSG_CHECKING([for jtreg]) |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
964 |
AC_MSG_RESULT(no) |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
965 |
else |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
966 |
if test "x$with_jtreg" != xyes; then |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
967 |
# with path specified. |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
968 |
JT_HOME="$with_jtreg" |
17593
de6741d8a142
8007129: build-infra Add configure --with-jtreg option for location of JTREG
erikj
parents:
16988
diff
changeset
|
969 |
fi |
17664
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
970 |
|
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
971 |
if test "x$JT_HOME" != x; then |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
972 |
AC_MSG_CHECKING([for jtreg]) |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
973 |
|
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
974 |
# use JT_HOME enviroment var. |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
975 |
BASIC_FIXUP_PATH([JT_HOME]) |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
976 |
|
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
977 |
# jtreg win32 script works for everybody |
29450 | 978 |
JTREGEXE="$JT_HOME/bin/jtreg" |
17664
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
979 |
|
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
980 |
if test ! -f "$JTREGEXE"; then |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
981 |
AC_MSG_ERROR([JTReg executable does not exist: $JTREGEXE]) |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
982 |
fi |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
983 |
|
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
984 |
AC_MSG_RESULT($JTREGEXE) |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
985 |
else |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
986 |
# try to find jtreg on path |
22475 | 987 |
BASIC_REQUIRE_PROGS(JTREGEXE, jtreg) |
17664
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
988 |
JT_HOME="`$DIRNAME $JTREGEXE`" |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
989 |
fi |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
990 |
fi |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
991 |
|
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
992 |
AC_SUBST(JT_HOME) |
2cb42641740b
8015510: (s) Improve JTReg location detection and provide location to test/Makefile
mduigou
parents:
17593
diff
changeset
|
993 |
AC_SUBST(JTREGEXE) |
17593
de6741d8a142
8007129: build-infra Add configure --with-jtreg option for location of JTREG
erikj
parents:
16988
diff
changeset
|
994 |
]) |