author | dchuyko |
Tue, 19 Jun 2018 18:18:46 +0300 | |
changeset 50642 | fff48b02d4a6 |
parent 47216 | 71c04702a3d5 |
child 53600 | 13e19ab0d687 |
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 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
26 |
AC_DEFUN([BPERF_CHECK_CORES], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
27 |
[ |
20363 | 28 |
AC_MSG_CHECKING([for number of cores]) |
29 |
NUM_CORES=1 |
|
30 |
FOUND_CORES=no |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
31 |
|
20363 | 32 |
if test -f /proc/cpuinfo; then |
33 |
# Looks like a Linux (or cygwin) system |
|
34 |
NUM_CORES=`cat /proc/cpuinfo | grep -c processor` |
|
35 |
FOUND_CORES=yes |
|
36 |
elif test -x /usr/sbin/psrinfo; then |
|
37 |
# Looks like a Solaris system |
|
38 |
NUM_CORES=`LC_MESSAGES=C /usr/sbin/psrinfo -v | grep -c on-line` |
|
39 |
FOUND_CORES=yes |
|
35035
053bef224e47
8147933: Configure check for number of cpus ignores HT on Macosx
erikj
parents:
34867
diff
changeset
|
40 |
elif test -x /usr/sbin/sysctl; then |
20363 | 41 |
# Looks like a MacOSX system |
35035
053bef224e47
8147933: Configure check for number of cpus ignores HT on Macosx
erikj
parents:
34867
diff
changeset
|
42 |
NUM_CORES=`/usr/sbin/sysctl -n hw.ncpu` |
20363 | 43 |
FOUND_CORES=yes |
22467 | 44 |
elif test "x$OPENJDK_BUILD_OS" = xaix ; then |
45 |
NUM_CORES=`/usr/sbin/prtconf | grep "^Number Of Processors" | awk '{ print [$]4 }'` |
|
46 |
FOUND_CORES=yes |
|
20363 | 47 |
elif test -n "$NUMBER_OF_PROCESSORS"; then |
48 |
# On windows, look in the env |
|
49 |
NUM_CORES=$NUMBER_OF_PROCESSORS |
|
50 |
FOUND_CORES=yes |
|
51 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
52 |
|
20363 | 53 |
if test "x$FOUND_CORES" = xyes; then |
54 |
AC_MSG_RESULT([$NUM_CORES]) |
|
55 |
else |
|
56 |
AC_MSG_RESULT([could not detect number of cores, defaulting to 1]) |
|
57 |
AC_MSG_WARN([This will disable all parallelism from build!]) |
|
58 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
59 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
60 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
61 |
AC_DEFUN([BPERF_CHECK_MEMORY_SIZE], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
62 |
[ |
20363 | 63 |
AC_MSG_CHECKING([for memory size]) |
64 |
# Default to 1024 MB |
|
65 |
MEMORY_SIZE=1024 |
|
66 |
FOUND_MEM=no |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
67 |
|
20363 | 68 |
if test -f /proc/meminfo; then |
69 |
# Looks like a Linux (or cygwin) system |
|
70 |
MEMORY_SIZE=`cat /proc/meminfo | grep MemTotal | awk '{print [$]2}'` |
|
71 |
MEMORY_SIZE=`expr $MEMORY_SIZE / 1024` |
|
72 |
FOUND_MEM=yes |
|
73 |
elif test -x /usr/sbin/prtconf; then |
|
22467 | 74 |
# Looks like a Solaris or AIX system |
35747 | 75 |
MEMORY_SIZE=`/usr/sbin/prtconf 2> /dev/null | grep "^Memory [[Ss]]ize" | awk '{ print [$]3 }'` |
20363 | 76 |
FOUND_MEM=yes |
35035
053bef224e47
8147933: Configure check for number of cpus ignores HT on Macosx
erikj
parents:
34867
diff
changeset
|
77 |
elif test -x /usr/sbin/sysctl; then |
20363 | 78 |
# Looks like a MacOSX system |
35035
053bef224e47
8147933: Configure check for number of cpus ignores HT on Macosx
erikj
parents:
34867
diff
changeset
|
79 |
MEMORY_SIZE=`/usr/sbin/sysctl -n hw.memsize` |
053bef224e47
8147933: Configure check for number of cpus ignores HT on Macosx
erikj
parents:
34867
diff
changeset
|
80 |
MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024` |
20363 | 81 |
FOUND_MEM=yes |
82 |
elif test "x$OPENJDK_BUILD_OS" = xwindows; then |
|
83 |
# Windows, but without cygwin |
|
84 |
MEMORY_SIZE=`wmic computersystem get totalphysicalmemory -value | grep = | cut -d "=" -f 2-` |
|
85 |
MEMORY_SIZE=`expr $MEMORY_SIZE / 1024 / 1024` |
|
86 |
FOUND_MEM=yes |
|
87 |
fi |
|
88 |
||
89 |
if test "x$FOUND_MEM" = xyes; then |
|
90 |
AC_MSG_RESULT([$MEMORY_SIZE MB]) |
|
91 |
else |
|
23985 | 92 |
AC_MSG_RESULT([could not detect memory size, defaulting to $MEMORY_SIZE MB]) |
20363 | 93 |
AC_MSG_WARN([This might seriously impact build performance!]) |
94 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
95 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
96 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
97 |
AC_DEFUN_ONCE([BPERF_SETUP_BUILD_CORES], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
98 |
[ |
15790 | 99 |
# How many cores do we have on this build system? |
100 |
AC_ARG_WITH(num-cores, [AS_HELP_STRING([--with-num-cores], |
|
20363 | 101 |
[number of cores in the build system, e.g. --with-num-cores=8 @<:@probed@:>@])]) |
15790 | 102 |
if test "x$with_num_cores" = x; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
103 |
# The number of cores were not specified, try to probe them. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
104 |
BPERF_CHECK_CORES |
15790 | 105 |
else |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
106 |
NUM_CORES=$with_num_cores |
15790 | 107 |
fi |
108 |
AC_SUBST(NUM_CORES) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
109 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
110 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
111 |
AC_DEFUN_ONCE([BPERF_SETUP_BUILD_MEMORY], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
112 |
[ |
15790 | 113 |
# How much memory do we have on this build system? |
114 |
AC_ARG_WITH(memory-size, [AS_HELP_STRING([--with-memory-size], |
|
20363 | 115 |
[memory (in MB) available in the build system, e.g. --with-memory-size=1024 @<:@probed@:>@])]) |
15790 | 116 |
if test "x$with_memory_size" = x; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
117 |
# The memory size was not specified, try to probe it. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
118 |
BPERF_CHECK_MEMORY_SIZE |
15790 | 119 |
else |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
120 |
MEMORY_SIZE=$with_memory_size |
15790 | 121 |
fi |
122 |
AC_SUBST(MEMORY_SIZE) |
|
123 |
]) |
|
124 |
||
125 |
AC_DEFUN_ONCE([BPERF_SETUP_BUILD_JOBS], |
|
126 |
[ |
|
20363 | 127 |
# Provide a decent default number of parallel jobs for make depending on |
15790 | 128 |
# number of cores, amount of memory and machine architecture. |
129 |
AC_ARG_WITH(jobs, [AS_HELP_STRING([--with-jobs], |
|
20363 | 130 |
[number of parallel jobs to let make run @<:@calculated based on cores and memory@:>@])]) |
15790 | 131 |
if test "x$with_jobs" = x; then |
132 |
# Number of jobs was not specified, calculate. |
|
133 |
AC_MSG_CHECKING([for appropriate number of jobs to run in parallel]) |
|
26131 | 134 |
# Approximate memory in GB. |
135 |
memory_gb=`expr $MEMORY_SIZE / 1024` |
|
15790 | 136 |
# Pick the lowest of memory in gb and number of cores. |
137 |
if test "$memory_gb" -lt "$NUM_CORES"; then |
|
138 |
JOBS="$memory_gb" |
|
139 |
else |
|
140 |
JOBS="$NUM_CORES" |
|
141 |
fi |
|
17660
b226baa345a2
8013920: Configure sets JOBS to 0 if memory is too low.
erikj
parents:
17592
diff
changeset
|
142 |
if test "$JOBS" -eq "0"; then |
b226baa345a2
8013920: Configure sets JOBS to 0 if memory is too low.
erikj
parents:
17592
diff
changeset
|
143 |
JOBS=1 |
b226baa345a2
8013920: Configure sets JOBS to 0 if memory is too low.
erikj
parents:
17592
diff
changeset
|
144 |
fi |
15790 | 145 |
AC_MSG_RESULT([$JOBS]) |
146 |
else |
|
147 |
JOBS=$with_jobs |
|
148 |
fi |
|
149 |
AC_SUBST(JOBS) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
150 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
151 |
|
34594
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
34119
diff
changeset
|
152 |
AC_DEFUN_ONCE([BPERF_SETUP_TEST_JOBS], |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
34119
diff
changeset
|
153 |
[ |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
34119
diff
changeset
|
154 |
# The number of test jobs will be chosen automatically if TEST_JOBS is 0 |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
34119
diff
changeset
|
155 |
AC_ARG_WITH(test-jobs, [AS_HELP_STRING([--with-test-jobs], |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
34119
diff
changeset
|
156 |
[number of parallel tests jobs to run @<:@based on build jobs@:>@])]) |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
34119
diff
changeset
|
157 |
if test "x$with_test_jobs" = x; then |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
34119
diff
changeset
|
158 |
TEST_JOBS=0 |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
34119
diff
changeset
|
159 |
else |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
34119
diff
changeset
|
160 |
TEST_JOBS=$with_test_jobs |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
34119
diff
changeset
|
161 |
fi |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
34119
diff
changeset
|
162 |
AC_SUBST(TEST_JOBS) |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
34119
diff
changeset
|
163 |
]) |
7e0595aab028
8139272: Add configure variable to set concurrency for jtreg tests
ehelin
parents:
34119
diff
changeset
|
164 |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
165 |
AC_DEFUN([BPERF_SETUP_CCACHE], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
166 |
[ |
20363 | 167 |
AC_ARG_ENABLE([ccache], |
22474 | 168 |
[AS_HELP_STRING([--enable-ccache], |
169 |
[enable using ccache to speed up recompilations @<:@disabled@:>@])]) |
|
170 |
||
28812
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
171 |
CCACHE_STATUS= |
22474 | 172 |
AC_MSG_CHECKING([is ccache enabled]) |
173 |
if test "x$enable_ccache" = xyes; then |
|
28812
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
174 |
if test "x$TOOLCHAIN_TYPE" = "xgcc" -o "x$TOOLCHAIN_TYPE" = "xclang"; then |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
175 |
AC_MSG_RESULT([yes]) |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
176 |
OLD_PATH="$PATH" |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
177 |
if test "x$TOOLCHAIN_PATH" != x; then |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
178 |
PATH=$TOOLCHAIN_PATH:$PATH |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
179 |
fi |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
180 |
BASIC_REQUIRE_PROGS(CCACHE, ccache) |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
181 |
PATH="$OLD_PATH" |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
182 |
CCACHE_VERSION=[`$CCACHE --version | head -n1 | $SED 's/[A-Za-z ]*//'`] |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
183 |
CCACHE_STATUS="Active ($CCACHE_VERSION)" |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
184 |
else |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
185 |
AC_MSG_RESULT([no]) |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
186 |
AC_MSG_WARN([ccache is not supported with toolchain type $TOOLCHAIN_TYPE]) |
20363 | 187 |
fi |
22474 | 188 |
elif test "x$enable_ccache" = xno; then |
189 |
AC_MSG_RESULT([no, explicitly disabled]) |
|
28812
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
190 |
CCACHE_STATUS="Disabled" |
22474 | 191 |
elif test "x$enable_ccache" = x; then |
192 |
AC_MSG_RESULT([no]) |
|
20363 | 193 |
else |
22474 | 194 |
AC_MSG_RESULT([unknown]) |
195 |
AC_MSG_ERROR([--enable-ccache does not accept any parameters]) |
|
20363 | 196 |
fi |
197 |
AC_SUBST(CCACHE) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
198 |
|
20363 | 199 |
AC_ARG_WITH([ccache-dir], |
200 |
[AS_HELP_STRING([--with-ccache-dir], |
|
201 |
[where to store ccache files @<:@~/.ccache@:>@])]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
202 |
|
20363 | 203 |
if test "x$with_ccache_dir" != x; then |
204 |
# When using a non home ccache directory, assume the use is to share ccache files |
|
205 |
# with other users. Thus change the umask. |
|
206 |
SET_CCACHE_DIR="CCACHE_DIR=$with_ccache_dir CCACHE_UMASK=002" |
|
22474 | 207 |
if test "x$CCACHE" = x; then |
208 |
AC_MSG_WARN([--with-ccache-dir has no meaning when ccache is not enabled]) |
|
209 |
fi |
|
20363 | 210 |
fi |
22474 | 211 |
|
20363 | 212 |
if test "x$CCACHE" != x; then |
213 |
BPERF_SETUP_CCACHE_USAGE |
|
214 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
215 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
216 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
217 |
AC_DEFUN([BPERF_SETUP_CCACHE_USAGE], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
218 |
[ |
20363 | 219 |
if test "x$CCACHE" != x; then |
42298 | 220 |
if test "x$OPENJDK_BUILD_OS" = "xmacosx"; then |
221 |
HAS_BAD_CCACHE=[`$ECHO $CCACHE_VERSION | \ |
|
222 |
$GREP -e '^1\.' -e '^2\.' -e '^3\.0\.' -e '^3\.1\.'`] |
|
223 |
if test "x$HAS_BAD_CCACHE" != "x"; then |
|
224 |
AC_MSG_ERROR([On macosx, ccache 3.2 or later is required, found $CCACHE_VERSION]) |
|
225 |
fi |
|
226 |
fi |
|
43388
509c3ebb5c97
8004842: Unify values of boolean make variables set in configure to true/false
ihse
parents:
42298
diff
changeset
|
227 |
if test "x$USE_PRECOMPILED_HEADER" = "xtrue"; then |
28812
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
228 |
HAS_BAD_CCACHE=[`$ECHO $CCACHE_VERSION | \ |
29175 | 229 |
$GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]$'`] |
28812
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
230 |
if test "x$HAS_BAD_CCACHE" != "x"; then |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
231 |
AC_MSG_ERROR([Precompiled headers requires ccache 3.1.4 or later, found $CCACHE_VERSION]) |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
232 |
fi |
20363 | 233 |
AC_MSG_CHECKING([if C-compiler supports ccache precompiled headers]) |
28812
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
234 |
CCACHE_PRECOMP_FLAG="-fpch-preprocess" |
20363 | 235 |
PUSHED_FLAGS="$CXXFLAGS" |
28812
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
236 |
CXXFLAGS="$CCACHE_PRECOMP_FLAG $CXXFLAGS" |
20363 | 237 |
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [CC_KNOWS_CCACHE_TRICK=yes], [CC_KNOWS_CCACHE_TRICK=no]) |
238 |
CXXFLAGS="$PUSHED_FLAGS" |
|
239 |
if test "x$CC_KNOWS_CCACHE_TRICK" = xyes; then |
|
240 |
AC_MSG_RESULT([yes]) |
|
28812
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
241 |
CFLAGS_CCACHE="$CCACHE_PRECOMP_FLAG" |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
242 |
AC_SUBST(CFLAGS_CCACHE) |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
243 |
CCACHE_SLOPPINESS=pch_defines,time_macros |
20363 | 244 |
else |
28812
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
245 |
AC_MSG_RESULT([no]) |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
246 |
AC_MSG_ERROR([Cannot use ccache with precompiled headers without compiler support for $CCACHE_PRECOMP_FLAG]) |
20363 | 247 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
248 |
fi |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
249 |
|
28812
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
250 |
CCACHE="CCACHE_COMPRESS=1 $SET_CCACHE_DIR \ |
6c36bc1ccc0e
8062223: Upgrading to ccache 1.3.10 disables the use of ccache
erikj
parents:
26907
diff
changeset
|
251 |
CCACHE_SLOPPINESS=$CCACHE_SLOPPINESS CCACHE_BASEDIR=$TOPDIR $CCACHE" |
20363 | 252 |
|
253 |
if test "x$SET_CCACHE_DIR" != x; then |
|
254 |
mkdir -p $CCACHE_DIR > /dev/null 2>&1 |
|
255 |
chmod a+rwxs $CCACHE_DIR > /dev/null 2>&1 |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
256 |
fi |
20363 | 257 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
258 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
259 |
|
34103 | 260 |
################################################################################ |
261 |
# |
|
34867 | 262 |
# Runs icecc-create-env once and prints the error if it fails |
263 |
# |
|
264 |
# $1: arguments to icecc-create-env |
|
265 |
# $2: log file |
|
266 |
# |
|
267 |
AC_DEFUN([BPERF_RUN_ICECC_CREATE_ENV], |
|
268 |
[ |
|
35747 | 269 |
( cd ${CONFIGURESUPPORT_OUTPUTDIR}/icecc \ |
270 |
&& ${ICECC_CREATE_ENV} $1 > $2 2>&1 ) |
|
34867 | 271 |
if test "$?" != "0"; then |
272 |
AC_MSG_NOTICE([icecc-create-env output:]) |
|
273 |
cat $2 |
|
274 |
AC_MSG_ERROR([Failed to create icecc compiler environment]) |
|
275 |
fi |
|
276 |
]) |
|
277 |
||
278 |
################################################################################ |
|
279 |
# |
|
34103 | 280 |
# Optionally enable distributed compilation of native code using icecc/icecream |
281 |
# |
|
282 |
AC_DEFUN([BPERF_SETUP_ICECC], |
|
283 |
[ |
|
284 |
AC_ARG_ENABLE([icecc], [AS_HELP_STRING([--enable-icecc], |
|
285 |
[enable distribted compilation of native code using icecc/icecream @<:@disabled@:>@])]) |
|
286 |
||
287 |
if test "x${enable_icecc}" = "xyes"; then |
|
288 |
BASIC_REQUIRE_PROGS(ICECC_CMD, icecc) |
|
289 |
old_path="$PATH" |
|
290 |
||
291 |
# Look for icecc-create-env in some known places |
|
292 |
PATH="$PATH:/usr/lib/icecc:/usr/lib64/icecc" |
|
293 |
BASIC_REQUIRE_PROGS(ICECC_CREATE_ENV, icecc-create-env) |
|
294 |
# Use icecc-create-env to create a minimal compilation environment that can |
|
295 |
# be sent to the other hosts in the icecream cluster. |
|
296 |
icecc_create_env_log="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env.log" |
|
297 |
${MKDIR} -p ${CONFIGURESUPPORT_OUTPUTDIR}/icecc |
|
34867 | 298 |
# Older versions of icecc does not have the --gcc parameter |
299 |
if ${ICECC_CREATE_ENV} | $GREP -q -e --gcc; then |
|
300 |
icecc_gcc_arg="--gcc" |
|
301 |
fi |
|
34103 | 302 |
if test "x${TOOLCHAIN_TYPE}" = "xgcc"; then |
34867 | 303 |
BPERF_RUN_ICECC_CREATE_ENV([${icecc_gcc_arg} ${CC} ${CXX}], \ |
304 |
${icecc_create_env_log}) |
|
34103 | 305 |
elif test "x$TOOLCHAIN_TYPE" = "xclang"; then |
306 |
# For clang, the icecc compilerwrapper is needed. It usually resides next |
|
307 |
# to icecc-create-env. |
|
308 |
BASIC_REQUIRE_PROGS(ICECC_WRAPPER, compilerwrapper) |
|
34867 | 309 |
BPERF_RUN_ICECC_CREATE_ENV([--clang ${CC} ${ICECC_WRAPPER}], ${icecc_create_env_log}) |
34103 | 310 |
else |
311 |
AC_MSG_ERROR([Can only create icecc compiler packages for toolchain types gcc and clang]) |
|
312 |
fi |
|
313 |
PATH="$old_path" |
|
314 |
# The bundle with the compiler gets a name based on checksums. Parse log file |
|
315 |
# to find it. |
|
316 |
ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log}`" |
|
317 |
ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}" |
|
34867 | 318 |
if test ! -f ${ICECC_ENV_BUNDLE}; then |
319 |
AC_MSG_ERROR([icecc-create-env did not produce an environment ${ICECC_ENV_BUNDLE}]) |
|
320 |
fi |
|
321 |
AC_MSG_CHECKING([for icecc build environment for target compiler]) |
|
34103 | 322 |
AC_MSG_RESULT([${ICECC_ENV_BUNDLE}]) |
323 |
ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${CC} ICECC_CXX=${CXX} ${ICECC_CMD}" |
|
324 |
||
325 |
if test "x${COMPILE_TYPE}" = "xcross"; then |
|
326 |
# If cross compiling, create a separate env package for the build compiler |
|
327 |
# Assume "gcc" or "cc" is gcc and "clang" is clang. Otherwise bail. |
|
34867 | 328 |
icecc_create_env_log_build="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/icecc_create_env_build.log" |
34103 | 329 |
if test "x${BUILD_CC##*/}" = "xgcc" || test "x${BUILD_CC##*/}" = "xcc"; then |
34867 | 330 |
BPERF_RUN_ICECC_CREATE_ENV([${icecc_gcc_arg} ${BUILD_CC} ${BUILD_CXX}], \ |
331 |
${icecc_create_env_log_build}) |
|
34103 | 332 |
elif test "x${BUILD_CC##*/}" = "xclang"; then |
34867 | 333 |
BPERF_RUN_ICECC_CREATE_ENV([--clang ${BUILD_CC} ${ICECC_WRAPPER}], ${icecc_create_env_log_build}) |
34103 | 334 |
else |
335 |
AC_MSG_ERROR([Cannot create icecc compiler package for ${BUILD_CC}]) |
|
336 |
fi |
|
34867 | 337 |
ICECC_ENV_BUNDLE_BASENAME="`${SED} -n '/^creating/s/creating //p' ${icecc_create_env_log_build}`" |
34103 | 338 |
ICECC_ENV_BUNDLE="${CONFIGURESUPPORT_OUTPUTDIR}/icecc/${ICECC_ENV_BUNDLE_BASENAME}" |
34867 | 339 |
if test ! -f ${ICECC_ENV_BUNDLE}; then |
340 |
AC_MSG_ERROR([icecc-create-env did not produce an environment ${ICECC_ENV_BUNDLE}]) |
|
341 |
fi |
|
342 |
AC_MSG_CHECKING([for icecc build environment for build compiler]) |
|
34103 | 343 |
AC_MSG_RESULT([${ICECC_ENV_BUNDLE}]) |
344 |
BUILD_ICECC="ICECC_VERSION=${ICECC_ENV_BUNDLE} ICECC_CC=${BUILD_CC} \ |
|
345 |
ICECC_CXX=${BUILD_CXX} ${ICECC_CMD}" |
|
346 |
else |
|
347 |
BUILD_ICECC="${ICECC}" |
|
348 |
fi |
|
349 |
AC_SUBST(ICECC) |
|
350 |
AC_SUBST(BUILD_ICECC) |
|
351 |
fi |
|
352 |
]) |
|
353 |
||
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
354 |
AC_DEFUN_ONCE([BPERF_SETUP_PRECOMPILED_HEADERS], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
355 |
[ |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
356 |
|
20363 | 357 |
############################################################################### |
358 |
# |
|
359 |
# Can the C/C++ compiler use precompiled headers? |
|
360 |
# |
|
361 |
AC_ARG_ENABLE([precompiled-headers], [AS_HELP_STRING([--disable-precompiled-headers], |
|
362 |
[disable using precompiled headers when compiling C++ @<:@enabled@:>@])], |
|
363 |
[ENABLE_PRECOMPH=${enable_precompiled_headers}], [ENABLE_PRECOMPH=yes]) |
|
364 |
||
43388
509c3ebb5c97
8004842: Unify values of boolean make variables set in configure to true/false
ihse
parents:
42298
diff
changeset
|
365 |
USE_PRECOMPILED_HEADER=true |
34103 | 366 |
AC_MSG_CHECKING([If precompiled header is enabled]) |
20363 | 367 |
if test "x$ENABLE_PRECOMPH" = xno; then |
34103 | 368 |
AC_MSG_RESULT([no, forced]) |
43388
509c3ebb5c97
8004842: Unify values of boolean make variables set in configure to true/false
ihse
parents:
42298
diff
changeset
|
369 |
USE_PRECOMPILED_HEADER=false |
34103 | 370 |
elif test "x$ICECC" != "x"; then |
371 |
AC_MSG_RESULT([no, does not work effectively with icecc]) |
|
43388
509c3ebb5c97
8004842: Unify values of boolean make variables set in configure to true/false
ihse
parents:
42298
diff
changeset
|
372 |
USE_PRECOMPILED_HEADER=false |
37402 | 373 |
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then |
374 |
AC_MSG_RESULT([no, does not work with Solaris Studio]) |
|
43388
509c3ebb5c97
8004842: Unify values of boolean make variables set in configure to true/false
ihse
parents:
42298
diff
changeset
|
375 |
USE_PRECOMPILED_HEADER=false |
39191 | 376 |
elif test "x$TOOLCHAIN_TYPE" = xxlc; then |
377 |
AC_MSG_RESULT([no, does not work with xlc]) |
|
43388
509c3ebb5c97
8004842: Unify values of boolean make variables set in configure to true/false
ihse
parents:
42298
diff
changeset
|
378 |
USE_PRECOMPILED_HEADER=false |
34103 | 379 |
else |
380 |
AC_MSG_RESULT([yes]) |
|
20363 | 381 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
382 |
|
20363 | 383 |
if test "x$ENABLE_PRECOMPH" = xyes; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
384 |
# Check that the compiler actually supports precomp headers. |
22721
63761da45392
8034788: Rewrite toolchain.m4 to support multiple toolchains per platform.
ihse
parents:
22476
diff
changeset
|
385 |
if test "x$TOOLCHAIN_TYPE" = xgcc; then |
20363 | 386 |
AC_MSG_CHECKING([that precompiled headers work]) |
387 |
echo "int alfa();" > conftest.h |
|
388 |
$CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD |
|
389 |
if test ! -f conftest.hpp.gch; then |
|
43388
509c3ebb5c97
8004842: Unify values of boolean make variables set in configure to true/false
ihse
parents:
42298
diff
changeset
|
390 |
USE_PRECOMPILED_HEADER=false |
20363 | 391 |
AC_MSG_RESULT([no]) |
392 |
else |
|
393 |
AC_MSG_RESULT([yes]) |
|
394 |
fi |
|
38843
2b141e8e916f
8158535: Configure script uses basic tools directly in many places
erikj
parents:
37407
diff
changeset
|
395 |
$RM conftest.h conftest.hpp.gch |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
396 |
fi |
20363 | 397 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
398 |
|
20363 | 399 |
AC_SUBST(USE_PRECOMPILED_HEADER) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
400 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
401 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
402 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
403 |
AC_DEFUN_ONCE([BPERF_SETUP_SMART_JAVAC], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
404 |
[ |
20363 | 405 |
AC_ARG_WITH(sjavac-server-java, [AS_HELP_STRING([--with-sjavac-server-java], |
406 |
[use this java binary for running the sjavac background server @<:@Boot JDK java@:>@])]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
407 |
|
20363 | 408 |
if test "x$with_sjavac_server_java" != x; then |
13697 | 409 |
SJAVAC_SERVER_JAVA="$with_sjavac_server_java" |
410 |
FOUND_VERSION=`$SJAVAC_SERVER_JAVA -version 2>&1 | grep " version \""` |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
411 |
if test "x$FOUND_VERSION" = x; then |
20363 | 412 |
AC_MSG_ERROR([Could not execute server java: $SJAVAC_SERVER_JAVA]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
413 |
fi |
20363 | 414 |
else |
26131 | 415 |
SJAVAC_SERVER_JAVA="$JAVA" |
20363 | 416 |
fi |
417 |
AC_SUBST(SJAVAC_SERVER_JAVA) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
418 |
|
26131 | 419 |
if test "$MEMORY_SIZE" -gt "3000"; then |
45051
676afd13dea5
8180198: make bootcycle-images fail with uses of -d64 flags
erikj
parents:
43388
diff
changeset
|
420 |
if "$JAVA" -version 2>&1 | $GREP -q "64-Bit"; then |
20363 | 421 |
JVM_64BIT=true |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
422 |
fi |
20363 | 423 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
424 |
|
26131 | 425 |
MX_VALUE=`expr $MEMORY_SIZE / 2` |
20363 | 426 |
if test "$JVM_64BIT" = true; then |
26131 | 427 |
# Set ms lower than mx since more than one instance of the server might |
428 |
# get launched at the same time before they figure out which instance won. |
|
429 |
MS_VALUE=512 |
|
430 |
if test "$MX_VALUE" -gt "2048"; then |
|
431 |
MX_VALUE=2048 |
|
17592 | 432 |
fi |
26131 | 433 |
else |
434 |
MS_VALUE=256 |
|
435 |
if test "$MX_VALUE" -gt "1500"; then |
|
436 |
MX_VALUE=1500 |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
437 |
fi |
20363 | 438 |
fi |
26131 | 439 |
if test "$MX_VALUE" -lt "512"; then |
440 |
MX_VALUE=512 |
|
20363 | 441 |
fi |
26907
da70acacfe57
8059658: Bootcycle build not actually using built image
erikj
parents:
26131
diff
changeset
|
442 |
ADD_JVM_ARG_IF_OK([-Xms${MS_VALUE}M -Xmx${MX_VALUE}M],SJAVAC_SERVER_JAVA_FLAGS,[$SJAVAC_SERVER_JAVA]) |
da70acacfe57
8059658: Bootcycle build not actually using built image
erikj
parents:
26131
diff
changeset
|
443 |
AC_SUBST(SJAVAC_SERVER_JAVA_FLAGS) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
444 |
|
20363 | 445 |
AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac], |
446 |
[use sjavac to do fast incremental compiles @<:@disabled@:>@])], |
|
33055
3676b99f33cf
8140312: Enable new sjavac server only mode in jdk build
erikj
parents:
29790
diff
changeset
|
447 |
[ENABLE_SJAVAC="${enableval}"], [ENABLE_SJAVAC="no"]) |
26131 | 448 |
if test "x$JVM_ARG_OK" = "xfalse"; then |
449 |
AC_MSG_WARN([Could not set -Xms${MS_VALUE}M -Xmx${MX_VALUE}M, disabling sjavac]) |
|
33055
3676b99f33cf
8140312: Enable new sjavac server only mode in jdk build
erikj
parents:
29790
diff
changeset
|
450 |
ENABLE_SJAVAC="no" |
26131 | 451 |
fi |
452 |
AC_MSG_CHECKING([whether to use sjavac]) |
|
20363 | 453 |
AC_MSG_RESULT([$ENABLE_SJAVAC]) |
454 |
AC_SUBST(ENABLE_SJAVAC) |
|
33055
3676b99f33cf
8140312: Enable new sjavac server only mode in jdk build
erikj
parents:
29790
diff
changeset
|
455 |
|
34104 | 456 |
AC_ARG_ENABLE([javac-server], [AS_HELP_STRING([--disable-javac-server], |
457 |
[disable javac server @<:@enabled@:>@])], |
|
458 |
[ENABLE_JAVAC_SERVER="${enableval}"], [ENABLE_JAVAC_SERVER="yes"]) |
|
33055
3676b99f33cf
8140312: Enable new sjavac server only mode in jdk build
erikj
parents:
29790
diff
changeset
|
459 |
if test "x$JVM_ARG_OK" = "xfalse"; then |
3676b99f33cf
8140312: Enable new sjavac server only mode in jdk build
erikj
parents:
29790
diff
changeset
|
460 |
AC_MSG_WARN([Could not set -Xms${MS_VALUE}M -Xmx${MX_VALUE}M, disabling javac server]) |
3676b99f33cf
8140312: Enable new sjavac server only mode in jdk build
erikj
parents:
29790
diff
changeset
|
461 |
ENABLE_JAVAC_SERVER="no" |
3676b99f33cf
8140312: Enable new sjavac server only mode in jdk build
erikj
parents:
29790
diff
changeset
|
462 |
fi |
3676b99f33cf
8140312: Enable new sjavac server only mode in jdk build
erikj
parents:
29790
diff
changeset
|
463 |
AC_MSG_CHECKING([whether to use javac server]) |
3676b99f33cf
8140312: Enable new sjavac server only mode in jdk build
erikj
parents:
29790
diff
changeset
|
464 |
AC_MSG_RESULT([$ENABLE_JAVAC_SERVER]) |
3676b99f33cf
8140312: Enable new sjavac server only mode in jdk build
erikj
parents:
29790
diff
changeset
|
465 |
AC_SUBST(ENABLE_JAVAC_SERVER) |
34101
a1db3b482137
8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents:
33055
diff
changeset
|
466 |
|
37036
9ee61185a43c
8154394: Bad test for ENABLE_SJAVAC in build-performance.m4
omajid
parents:
35747
diff
changeset
|
467 |
if test "x$ENABLE_JAVAC_SERVER" = "xyes" || test "x$ENABLE_SJAVAC" = "xyes"; then |
34101
a1db3b482137
8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents:
33055
diff
changeset
|
468 |
# When using a server javac, the small client instances do not need much |
a1db3b482137
8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents:
33055
diff
changeset
|
469 |
# resources. |
a1db3b482137
8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents:
33055
diff
changeset
|
470 |
JAVA_FLAGS_JAVAC="$JAVA_FLAGS_SMALL" |
a1db3b482137
8143296: javac-server/sjavac not compatible with LogFailures on Windows
erikj
parents:
33055
diff
changeset
|
471 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
472 |
]) |