author | shade |
Tue, 01 Sep 2015 12:57:41 +0300 | |
changeset 32467 | 23b29549f8d1 |
parent 29305 | 4ddc6faf7842 |
child 33926 | 3a19edba4808 |
child 32554 | c8b77b422f5b |
permissions | -rw-r--r-- |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
1 |
# |
22714
a752920c4317
8034191: Move relevant parts of build system to new closed repo
ihse
parents:
22709
diff
changeset
|
2 |
# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
3 |
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
4 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
5 |
# This code is free software; you can redistribute it and/or modify it |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
6 |
# under the terms of the GNU General Public License version 2 only, as |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
7 |
# published by the Free Software Foundation. Oracle designates this |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
8 |
# particular file as subject to the "Classpath" exception as provided |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
9 |
# by Oracle in the LICENSE file that accompanied this code. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
10 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
11 |
# This code is distributed in the hope that it will be useful, but WITHOUT |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
12 |
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
13 |
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
14 |
# version 2 for more details (a copy is included in the LICENSE file that |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
15 |
# accompanied this code). |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
16 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
17 |
# You should have received a copy of the GNU General Public License version |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
18 |
# 2 along with this work; if not, write to the Free Software Foundation, |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
19 |
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
20 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
21 |
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
22 |
# or visit www.oracle.com if you need additional information or have any |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
23 |
# questions. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
24 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
25 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
26 |
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VARIANT], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
27 |
[ |
20363 | 28 |
############################################################################### |
29 |
# |
|
30 |
# Check which variant of the JDK that we want to build. |
|
31 |
# Currently we have: |
|
32 |
# normal: standard edition |
|
33 |
# but the custom make system may add other variants |
|
34 |
# |
|
35 |
# Effectively the JDK variant gives a name to a specific set of |
|
36 |
# modules to compile into the JDK. In the future, these modules |
|
37 |
# might even be Jigsaw modules. |
|
38 |
# |
|
39 |
AC_MSG_CHECKING([which variant of the JDK to build]) |
|
40 |
AC_ARG_WITH([jdk-variant], [AS_HELP_STRING([--with-jdk-variant], |
|
41 |
[JDK variant to build (normal) @<:@normal@:>@])]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
42 |
|
20363 | 43 |
if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
44 |
JDK_VARIANT="normal" |
20363 | 45 |
else |
13697 | 46 |
AC_MSG_ERROR([The available JDK variants are: normal]) |
20363 | 47 |
fi |
13697 | 48 |
|
20363 | 49 |
AC_SUBST(JDK_VARIANT) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
50 |
|
20363 | 51 |
AC_MSG_RESULT([$JDK_VARIANT]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
52 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
53 |
|
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
54 |
AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_INTERPRETER], |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
55 |
[ |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
56 |
############################################################################### |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
57 |
# |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
58 |
# Check which interpreter of the JVM we want to build. |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
59 |
# Currently we have: |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
60 |
# template: Template interpreter (the default) |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
61 |
# cpp : C++ interpreter |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
62 |
AC_MSG_CHECKING([which interpreter of the JVM to build]) |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
63 |
AC_ARG_WITH([jvm-interpreter], [AS_HELP_STRING([--with-jvm-interpreter], |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
64 |
[JVM interpreter to build (template, cpp) @<:@template@:>@])]) |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
65 |
|
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
66 |
if test "x$with_jvm_interpreter" = x; then |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
67 |
with_jvm_interpreter="template" |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
68 |
fi |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
69 |
|
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
70 |
JVM_INTERPRETER="$with_jvm_interpreter" |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
71 |
|
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
72 |
if test "x$JVM_INTERPRETER" != xtemplate && test "x$JVM_INTERPRETER" != xcpp; then |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
73 |
AC_MSG_ERROR([The available JVM interpreters are: template, cpp]) |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
74 |
fi |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
75 |
|
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
76 |
AC_SUBST(JVM_INTERPRETER) |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
77 |
|
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
78 |
AC_MSG_RESULT([$with_jvm_interpreter]) |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
79 |
]) |
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
80 |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
81 |
AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
82 |
[ |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
83 |
|
20363 | 84 |
############################################################################### |
85 |
# |
|
86 |
# Check which variants of the JVM that we want to build. |
|
87 |
# Currently we have: |
|
88 |
# server: normal interpreter and a tiered C1/C2 compiler |
|
89 |
# client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms) |
|
90 |
# minimal1: reduced form of client with optional VM services and features stripped out |
|
91 |
# kernel: kernel footprint JVM that passes the TCK without major performance problems, |
|
92 |
# ie normal interpreter and C1, only the serial GC, kernel jvmti etc |
|
93 |
# zero: no machine code interpreter, no compiler |
|
94 |
# zeroshark: zero interpreter and shark/llvm compiler backend |
|
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
95 |
# core: interpreter only, no compiler (only works on some platforms) |
20363 | 96 |
AC_MSG_CHECKING([which variants of the JVM to build]) |
97 |
AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants], |
|
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
98 |
[JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark, core) @<:@server@:>@])]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
99 |
|
20363 | 100 |
if test "x$with_jvm_variants" = x; then |
101 |
with_jvm_variants="server" |
|
102 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
103 |
|
20363 | 104 |
JVM_VARIANTS=",$with_jvm_variants," |
22467 | 105 |
TEST_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,//' -e 's/client,//' -e 's/minimal1,//' -e 's/kernel,//' -e 's/zero,//' -e 's/zeroshark,//' -e 's/core,//'` |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
106 |
|
20363 | 107 |
if test "x$TEST_VARIANTS" != "x,"; then |
22467 | 108 |
AC_MSG_ERROR([The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark, core]) |
20363 | 109 |
fi |
110 |
AC_MSG_RESULT([$with_jvm_variants]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
111 |
|
20363 | 112 |
JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'` |
113 |
JVM_VARIANT_CLIENT=`$ECHO "$JVM_VARIANTS" | $SED -e '/,client,/!s/.*/false/g' -e '/,client,/s/.*/true/g'` |
|
114 |
JVM_VARIANT_MINIMAL1=`$ECHO "$JVM_VARIANTS" | $SED -e '/,minimal1,/!s/.*/false/g' -e '/,minimal1,/s/.*/true/g'` |
|
115 |
JVM_VARIANT_KERNEL=`$ECHO "$JVM_VARIANTS" | $SED -e '/,kernel,/!s/.*/false/g' -e '/,kernel,/s/.*/true/g'` |
|
116 |
JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'` |
|
117 |
JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'` |
|
22467 | 118 |
JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'` |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
119 |
|
20363 | 120 |
if test "x$JVM_VARIANT_CLIENT" = xtrue; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
121 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
20363 | 122 |
AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
123 |
fi |
20363 | 124 |
fi |
125 |
if test "x$JVM_VARIANT_KERNEL" = xtrue; then |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
126 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
20363 | 127 |
AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
128 |
fi |
20363 | 129 |
fi |
130 |
if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then |
|
14810 | 131 |
if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then |
20363 | 132 |
AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.]) |
14810 | 133 |
fi |
20363 | 134 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
135 |
|
20363 | 136 |
# Replace the commas with AND for use in the build directory name. |
22181
0fc1d3eb4358
8031709: Configure --with-jvm-variants=client, server, x produces default outputdir containing comma
erikj
parents:
22176
diff
changeset
|
137 |
ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/g'` |
22467 | 138 |
COUNT_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/server,/1/' -e 's/client,/1/' -e 's/minimal1,/1/' -e 's/kernel,/1/' -e 's/zero,/1/' -e 's/zeroshark,/1/' -e 's/core,/1/'` |
20363 | 139 |
if test "x$COUNT_VARIANTS" != "x,1"; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
140 |
BUILDING_MULTIPLE_JVM_VARIANTS=yes |
20363 | 141 |
else |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
142 |
BUILDING_MULTIPLE_JVM_VARIANTS=no |
20363 | 143 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
144 |
|
20363 | 145 |
AC_SUBST(JVM_VARIANTS) |
146 |
AC_SUBST(JVM_VARIANT_SERVER) |
|
147 |
AC_SUBST(JVM_VARIANT_CLIENT) |
|
148 |
AC_SUBST(JVM_VARIANT_MINIMAL1) |
|
149 |
AC_SUBST(JVM_VARIANT_KERNEL) |
|
150 |
AC_SUBST(JVM_VARIANT_ZERO) |
|
151 |
AC_SUBST(JVM_VARIANT_ZEROSHARK) |
|
22467 | 152 |
AC_SUBST(JVM_VARIANT_CORE) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
153 |
|
20363 | 154 |
INCLUDE_SA=true |
155 |
if test "x$JVM_VARIANT_ZERO" = xtrue ; then |
|
16581
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16423
diff
changeset
|
156 |
INCLUDE_SA=false |
20363 | 157 |
fi |
158 |
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then |
|
16581
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16423
diff
changeset
|
159 |
INCLUDE_SA=false |
20363 | 160 |
fi |
25616
5730ea123552
8049715: PPC64: First steps to enable SA on Linux/PPC64
simonis
parents:
23424
diff
changeset
|
161 |
if test "x$OPENJDK_TARGET_OS" = xaix ; then |
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
162 |
INCLUDE_SA=false |
22467 | 163 |
fi |
29161 | 164 |
if test "x$OPENJDK_TARGET_CPU" = xaarch64; then |
165 |
INCLUDE_SA=false |
|
166 |
fi |
|
20363 | 167 |
AC_SUBST(INCLUDE_SA) |
16581
b2cddec593f4
8011388: Support building zero and zeroshark with the new build
omajid
parents:
16423
diff
changeset
|
168 |
|
20363 | 169 |
if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then |
170 |
MACOSX_UNIVERSAL="true" |
|
171 |
fi |
|
13697 | 172 |
|
20363 | 173 |
AC_SUBST(MACOSX_UNIVERSAL) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
174 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
175 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
176 |
AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_LEVEL], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
177 |
[ |
20363 | 178 |
############################################################################### |
179 |
# |
|
180 |
# Set the debug level |
|
181 |
# release: no debug information, all optimizations, no asserts. |
|
23424
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
182 |
# optimized: no debug information, all optimizations, no asserts, HotSpot target is 'optimized'. |
20363 | 183 |
# fastdebug: debug information (-g), all optimizations, all asserts |
184 |
# slowdebug: debug information (-g), no optimizations, all asserts |
|
185 |
# |
|
186 |
DEBUG_LEVEL="release" |
|
187 |
AC_MSG_CHECKING([which debug level to use]) |
|
188 |
AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], |
|
189 |
[set the debug level to fastdebug (shorthand for --with-debug-level=fastdebug) @<:@disabled@:>@])], |
|
190 |
[ |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
191 |
ENABLE_DEBUG="${enableval}" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
192 |
DEBUG_LEVEL="fastdebug" |
20363 | 193 |
], [ENABLE_DEBUG="no"]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
194 |
|
20363 | 195 |
AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level], |
23424
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
196 |
[set the debug level (release, fastdebug, slowdebug, optimized (HotSpot build only)) @<:@release@:>@])], |
20363 | 197 |
[ |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
198 |
DEBUG_LEVEL="${withval}" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
199 |
if test "x$ENABLE_DEBUG" = xyes; then |
20363 | 200 |
AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
201 |
fi |
20363 | 202 |
]) |
203 |
AC_MSG_RESULT([$DEBUG_LEVEL]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
204 |
|
20363 | 205 |
if test "x$DEBUG_LEVEL" != xrelease && \ |
23424
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
206 |
test "x$DEBUG_LEVEL" != xoptimized && \ |
20363 | 207 |
test "x$DEBUG_LEVEL" != xfastdebug && \ |
208 |
test "x$DEBUG_LEVEL" != xslowdebug; then |
|
209 |
AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug]) |
|
210 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
211 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
212 |
|
20363 | 213 |
############################################################################### |
214 |
# |
|
215 |
# Setup legacy vars/targets and new vars to deal with different debug levels. |
|
216 |
# |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
217 |
|
20363 | 218 |
case $DEBUG_LEVEL in |
219 |
release ) |
|
220 |
VARIANT="OPT" |
|
221 |
FASTDEBUG="false" |
|
222 |
DEBUG_CLASSFILES="false" |
|
223 |
BUILD_VARIANT_RELEASE="" |
|
224 |
HOTSPOT_DEBUG_LEVEL="product" |
|
225 |
HOTSPOT_EXPORT="product" |
|
226 |
;; |
|
227 |
fastdebug ) |
|
228 |
VARIANT="DBG" |
|
229 |
FASTDEBUG="true" |
|
230 |
DEBUG_CLASSFILES="true" |
|
231 |
BUILD_VARIANT_RELEASE="-fastdebug" |
|
232 |
HOTSPOT_DEBUG_LEVEL="fastdebug" |
|
233 |
HOTSPOT_EXPORT="fastdebug" |
|
234 |
;; |
|
235 |
slowdebug ) |
|
236 |
VARIANT="DBG" |
|
237 |
FASTDEBUG="false" |
|
238 |
DEBUG_CLASSFILES="true" |
|
239 |
BUILD_VARIANT_RELEASE="-debug" |
|
26546
2ea705d15f8c
8058317: Top-level Makefiles uses deprecated target jvmg in HotSpot Makefiles
ehelin
parents:
25854
diff
changeset
|
240 |
HOTSPOT_DEBUG_LEVEL="debug" |
20363 | 241 |
HOTSPOT_EXPORT="debug" |
242 |
;; |
|
23424
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
243 |
optimized ) |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
244 |
VARIANT="OPT" |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
245 |
FASTDEBUG="false" |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
246 |
DEBUG_CLASSFILES="false" |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
247 |
BUILD_VARIANT_RELEASE="-optimized" |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
248 |
HOTSPOT_DEBUG_LEVEL="optimized" |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
249 |
HOTSPOT_EXPORT="optimized" |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
250 |
;; |
20363 | 251 |
esac |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
252 |
|
23424
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
253 |
# The debug level 'optimized' is a little special because it is currently only |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
254 |
# applicable to the HotSpot build where it means to build a completely |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
255 |
# optimized version of the VM without any debugging code (like for the |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
256 |
# 'release' debug level which is called 'product' in the HotSpot build) but |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
257 |
# with the exception that it can contain additional code which is otherwise |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
258 |
# protected by '#ifndef PRODUCT' macros. These 'optimized' builds are used to |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
259 |
# test new and/or experimental features which are not intended for customer |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
260 |
# shipment. Because these new features need to be tested and benchmarked in |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
261 |
# real world scenarios, we want to build the containing JDK at the 'release' |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
262 |
# debug level. |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
263 |
if test "x$DEBUG_LEVEL" = xoptimized; then |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
264 |
DEBUG_LEVEL="release" |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
265 |
fi |
65039fb99fda
8037298: Export HotSpots 'optimized' (i.e. not-product) configuration in the top-level configure/makefile
simonis
parents:
22721
diff
changeset
|
266 |
|
20363 | 267 |
##### |
268 |
# Generate the legacy makefile targets for hotspot. |
|
269 |
# The hotspot api for selecting the build artifacts, really, needs to be improved. |
|
270 |
# JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to |
|
271 |
# determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc |
|
272 |
# But until then ... |
|
273 |
HOTSPOT_TARGET="" |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
274 |
|
20363 | 275 |
if test "x$JVM_VARIANT_SERVER" = xtrue; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
276 |
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} " |
20363 | 277 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
278 |
|
20363 | 279 |
if test "x$JVM_VARIANT_CLIENT" = xtrue; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
280 |
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 " |
20363 | 281 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
282 |
|
20363 | 283 |
if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then |
14810 | 284 |
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 " |
20363 | 285 |
fi |
14810 | 286 |
|
20363 | 287 |
if test "x$JVM_VARIANT_KERNEL" = xtrue; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
288 |
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel " |
20363 | 289 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
290 |
|
20363 | 291 |
if test "x$JVM_VARIANT_ZERO" = xtrue; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
292 |
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero " |
20363 | 293 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
294 |
|
20363 | 295 |
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
296 |
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark " |
20363 | 297 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
298 |
|
22467 | 299 |
if test "x$JVM_VARIANT_CORE" = xtrue; then |
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
300 |
HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core " |
22467 | 301 |
fi |
22460
0273c023680c
8017568: PPC64: Generic build preparations needed to enable new build on Linux/PPC64
simonis
parents:
17819
diff
changeset
|
302 |
|
20363 | 303 |
HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT" |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
304 |
|
20363 | 305 |
# On Macosx universal binaries are produced, but they only contain |
306 |
# 64 bit intel. This invalidates control of which jvms are built |
|
307 |
# from configure, but only server is valid anyway. Fix this |
|
308 |
# when hotspot makefiles are rewritten. |
|
309 |
if test "x$MACOSX_UNIVERSAL" = xtrue; then |
|
15054
e649ff651503
8004490: build-infra: mac: hotspot is always built in product, regardless of --with-debug-level setting
erikj
parents:
14810
diff
changeset
|
310 |
HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT} |
20363 | 311 |
fi |
13697 | 312 |
|
20363 | 313 |
##### |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
314 |
|
20363 | 315 |
AC_SUBST(DEBUG_LEVEL) |
316 |
AC_SUBST(VARIANT) |
|
317 |
AC_SUBST(FASTDEBUG) |
|
318 |
AC_SUBST(DEBUG_CLASSFILES) |
|
319 |
AC_SUBST(BUILD_VARIANT_RELEASE) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
320 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
321 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
322 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
323 |
############################################################################### |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
324 |
# |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
325 |
# Should we build only OpenJDK even if closed sources are present? |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
326 |
# |
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
327 |
AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM], |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
328 |
[ |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
329 |
AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only], |
20363 | 330 |
[suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"]) |
14111 | 331 |
|
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
332 |
AC_MSG_CHECKING([for presence of closed sources]) |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
333 |
if test -d "$SRC_ROOT/jdk/src/closed"; then |
14111 | 334 |
CLOSED_SOURCE_PRESENT=yes |
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
335 |
else |
14111 | 336 |
CLOSED_SOURCE_PRESENT=no |
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
337 |
fi |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
338 |
AC_MSG_RESULT([$CLOSED_SOURCE_PRESENT]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
339 |
|
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
340 |
AC_MSG_CHECKING([if closed source is suppressed (openjdk-only)]) |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
341 |
SUPPRESS_CLOSED_SOURCE="$enable_openjdk_only" |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
342 |
AC_MSG_RESULT([$SUPPRESS_CLOSED_SOURCE]) |
14111 | 343 |
|
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
344 |
if test "x$CLOSED_SOURCE_PRESENT" = xno; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
345 |
OPENJDK=true |
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
346 |
if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
347 |
AC_MSG_WARN([No closed source present, --enable-openjdk-only makes no sense]) |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
348 |
fi |
14111 | 349 |
else |
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
350 |
if test "x$SUPPRESS_CLOSED_SOURCE" = "xyes"; then |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
351 |
OPENJDK=true |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
352 |
else |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
353 |
OPENJDK=false |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
354 |
fi |
14111 | 355 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
356 |
|
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
357 |
if test "x$OPENJDK" = "xtrue"; then |
14111 | 358 |
SET_OPENJDK="OPENJDK=true" |
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
359 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
360 |
|
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
361 |
AC_SUBST(SET_OPENJDK) |
22714
a752920c4317
8034191: Move relevant parts of build system to new closed repo
ihse
parents:
22709
diff
changeset
|
362 |
|
a752920c4317
8034191: Move relevant parts of build system to new closed repo
ihse
parents:
22709
diff
changeset
|
363 |
# custom-make-dir is deprecated. Please use your custom-hook.m4 to override |
a752920c4317
8034191: Move relevant parts of build system to new closed repo
ihse
parents:
22709
diff
changeset
|
364 |
# the IncludeCustomExtension macro. |
a752920c4317
8034191: Move relevant parts of build system to new closed repo
ihse
parents:
22709
diff
changeset
|
365 |
BASIC_DEPRECATED_ARG_WITH(custom-make-dir) |
15069
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
366 |
]) |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
367 |
|
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
368 |
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], |
c6dab988d808
8005850: build-infra: Make --enable-openjdk-only really disable custom
erikj
parents:
15067
diff
changeset
|
369 |
[ |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
370 |
|
20363 | 371 |
############################################################################### |
372 |
# |
|
373 |
# Should we build a JDK/JVM with headful support (ie a graphical ui)? |
|
374 |
# We always build headless support. |
|
375 |
# |
|
376 |
AC_MSG_CHECKING([headful support]) |
|
377 |
AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful], |
|
378 |
[disable building headful support (graphical UI support) @<:@enabled@:>@])], |
|
379 |
[SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
380 |
|
20363 | 381 |
SUPPORT_HEADLESS=yes |
382 |
BUILD_HEADLESS="BUILD_HEADLESS:=true" |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
383 |
|
20363 | 384 |
if test "x$SUPPORT_HEADFUL" = xyes; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
385 |
# We are building both headful and headless. |
20273 | 386 |
headful_msg="include support for both headful and headless" |
20363 | 387 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
388 |
|
20363 | 389 |
if test "x$SUPPORT_HEADFUL" = xno; then |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
390 |
# Thus we are building headless only. |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
391 |
BUILD_HEADLESS="BUILD_HEADLESS:=true" |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
392 |
headful_msg="headless only" |
20363 | 393 |
fi |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
394 |
|
20363 | 395 |
AC_MSG_RESULT([$headful_msg]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
396 |
|
20363 | 397 |
AC_SUBST(SUPPORT_HEADLESS) |
398 |
AC_SUBST(SUPPORT_HEADFUL) |
|
399 |
AC_SUBST(BUILD_HEADLESS) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
400 |
|
20363 | 401 |
# Control wether Hotspot runs Queens test after build. |
402 |
AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build], |
|
403 |
[run the Queens test after Hotspot build @<:@disabled@:>@])],, |
|
404 |
[enable_hotspot_test_in_build=no]) |
|
405 |
if test "x$enable_hotspot_test_in_build" = "xyes"; then |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
406 |
TEST_IN_BUILD=true |
20363 | 407 |
else |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
408 |
TEST_IN_BUILD=false |
20363 | 409 |
fi |
410 |
AC_SUBST(TEST_IN_BUILD) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
411 |
|
20363 | 412 |
############################################################################### |
413 |
# |
|
414 |
# Choose cacerts source file |
|
415 |
# |
|
416 |
AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file], |
|
417 |
[specify alternative cacerts file])]) |
|
418 |
if test "x$with_cacerts_file" != x; then |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
419 |
CACERTS_FILE=$with_cacerts_file |
20363 | 420 |
fi |
421 |
AC_SUBST(CACERTS_FILE) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
422 |
|
20363 | 423 |
############################################################################### |
424 |
# |
|
425 |
# Enable or disable unlimited crypto |
|
426 |
# |
|
427 |
AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--enable-unlimited-crypto], |
|
428 |
[Enable unlimited crypto policy @<:@disabled@:>@])],, |
|
429 |
[enable_unlimited_crypto=no]) |
|
430 |
if test "x$enable_unlimited_crypto" = "xyes"; then |
|
14112
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
431 |
UNLIMITED_CRYPTO=true |
20363 | 432 |
else |
14112
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
433 |
UNLIMITED_CRYPTO=false |
20363 | 434 |
fi |
435 |
AC_SUBST(UNLIMITED_CRYPTO) |
|
14112
1b447f5cb0d1
8001897: build-infra: misc adjustments to configure script
ihse
parents:
14111
diff
changeset
|
436 |
|
20363 | 437 |
############################################################################### |
438 |
# |
|
439 |
# Enable or disable the elliptic curve crypto implementation |
|
440 |
# |
|
441 |
AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC], |
|
442 |
[ |
|
443 |
AC_MSG_CHECKING([if elliptic curve crypto implementation is present]) |
|
15914
1338d1e0e058
8010030: Allow configure to detect if EC implementation is present
omajid
parents:
15180
diff
changeset
|
444 |
|
25854 | 445 |
if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then |
20363 | 446 |
ENABLE_INTREE_EC=yes |
447 |
AC_MSG_RESULT([yes]) |
|
448 |
else |
|
449 |
ENABLE_INTREE_EC=no |
|
450 |
AC_MSG_RESULT([no]) |
|
451 |
fi |
|
15914
1338d1e0e058
8010030: Allow configure to detect if EC implementation is present
omajid
parents:
15180
diff
changeset
|
452 |
|
20363 | 453 |
AC_SUBST(ENABLE_INTREE_EC) |
454 |
]) |
|
15914
1338d1e0e058
8010030: Allow configure to detect if EC implementation is present
omajid
parents:
15180
diff
changeset
|
455 |
|
20363 | 456 |
############################################################################### |
457 |
# |
|
22709
540ed4c23085
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
alanb
parents:
22473
diff
changeset
|
458 |
# --enable-rmiconnector-iiop |
540ed4c23085
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
alanb
parents:
22473
diff
changeset
|
459 |
# |
540ed4c23085
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
alanb
parents:
22473
diff
changeset
|
460 |
AC_ARG_ENABLE(rmiconnector-iiop, [AS_HELP_STRING([--enable-rmiconnector-iiop], |
540ed4c23085
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
alanb
parents:
22473
diff
changeset
|
461 |
[enable the JMX RMIConnector iiop transport @<:@disabled@:>@])]) |
540ed4c23085
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
alanb
parents:
22473
diff
changeset
|
462 |
if test "x$enable_rmiconnector_iiop" = "xyes"; then |
540ed4c23085
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
alanb
parents:
22473
diff
changeset
|
463 |
RMICONNECTOR_IIOP=true |
540ed4c23085
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
alanb
parents:
22473
diff
changeset
|
464 |
else |
540ed4c23085
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
alanb
parents:
22473
diff
changeset
|
465 |
RMICONNECTOR_IIOP=false |
540ed4c23085
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
alanb
parents:
22473
diff
changeset
|
466 |
fi |
540ed4c23085
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
alanb
parents:
22473
diff
changeset
|
467 |
AC_SUBST(RMICONNECTOR_IIOP) |
540ed4c23085
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
alanb
parents:
22473
diff
changeset
|
468 |
|
540ed4c23085
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
alanb
parents:
22473
diff
changeset
|
469 |
############################################################################### |
540ed4c23085
8033366: Add configure option to allow RMIConnector IIOP transport be selected compiled in or not
alanb
parents:
22473
diff
changeset
|
470 |
# |
20363 | 471 |
# Compress jars |
472 |
# |
|
473 |
COMPRESS_JARS=false |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
474 |
|
20363 | 475 |
AC_SUBST(COMPRESS_JARS) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
476 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
477 |
|
15056
6a7cbe3b0f08
8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents:
15055
diff
changeset
|
478 |
############################################################################### |
6a7cbe3b0f08
8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents:
15055
diff
changeset
|
479 |
# |
6a7cbe3b0f08
8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents:
15055
diff
changeset
|
480 |
# Setup version numbers |
6a7cbe3b0f08
8005347: build-infra: Verify 'gnumake source' at the top level works ok
erikj
parents:
15055
diff
changeset
|
481 |
# |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
482 |
AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
483 |
[ |
20363 | 484 |
# Source the version numbers |
485 |
. $AUTOCONF_DIR/version-numbers |
|
15055
25fc052ccadd
8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents:
15054
diff
changeset
|
486 |
|
20363 | 487 |
# Get the settings from parameters |
488 |
AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone], |
|
489 |
[Set milestone value for build @<:@internal@:>@])]) |
|
490 |
if test "x$with_milestone" = xyes; then |
|
491 |
AC_MSG_ERROR([Milestone must have a value]) |
|
492 |
elif test "x$with_milestone" != x; then |
|
15055
25fc052ccadd
8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents:
15054
diff
changeset
|
493 |
MILESTONE="$with_milestone" |
20363 | 494 |
fi |
495 |
if test "x$MILESTONE" = x; then |
|
496 |
MILESTONE=internal |
|
497 |
fi |
|
15055
25fc052ccadd
8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents:
15054
diff
changeset
|
498 |
|
20363 | 499 |
AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version], |
500 |
[Set update version value for build @<:@b00@:>@])]) |
|
501 |
if test "x$with_update_version" = xyes; then |
|
502 |
AC_MSG_ERROR([Update version must have a value]) |
|
503 |
elif test "x$with_update_version" != x; then |
|
504 |
JDK_UPDATE_VERSION="$with_update_version" |
|
22176
3dae78c445a6
8029908: jdk 8u5 mac build produces incorrect version string 1.8.0_5
erikj
parents:
21057
diff
changeset
|
505 |
# On macosx 10.7, it's not possible to set --with-update-version=0X due |
3dae78c445a6
8029908: jdk 8u5 mac build produces incorrect version string 1.8.0_5
erikj
parents:
21057
diff
changeset
|
506 |
# to a bug in expr (which reduces it to just X). To work around this, we |
3dae78c445a6
8029908: jdk 8u5 mac build produces incorrect version string 1.8.0_5
erikj
parents:
21057
diff
changeset
|
507 |
# always add a 0 to one digit update versions. |
3dae78c445a6
8029908: jdk 8u5 mac build produces incorrect version string 1.8.0_5
erikj
parents:
21057
diff
changeset
|
508 |
if test "${#JDK_UPDATE_VERSION}" = "1"; then |
3dae78c445a6
8029908: jdk 8u5 mac build produces incorrect version string 1.8.0_5
erikj
parents:
21057
diff
changeset
|
509 |
JDK_UPDATE_VERSION="0${JDK_UPDATE_VERSION}" |
3dae78c445a6
8029908: jdk 8u5 mac build produces incorrect version string 1.8.0_5
erikj
parents:
21057
diff
changeset
|
510 |
fi |
20363 | 511 |
fi |
17663
d2ae6f7a7e7b
8015784: Add configure parameter --with-update-version
erikj
parents:
16581
diff
changeset
|
512 |
|
20363 | 513 |
AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix], |
22714
a752920c4317
8034191: Move relevant parts of build system to new closed repo
ihse
parents:
22709
diff
changeset
|
514 |
[Add a custom string to the version string if build number is not set.@<:@username_builddateb00@:>@])]) |
20363 | 515 |
if test "x$with_user_release_suffix" = xyes; then |
516 |
AC_MSG_ERROR([Release suffix must have a value]) |
|
517 |
elif test "x$with_user_release_suffix" != x; then |
|
518 |
USER_RELEASE_SUFFIX="$with_user_release_suffix" |
|
519 |
fi |
|
20275
bdf86ab49b78
8005924: Make it possible to set both --with-user-release-suffix and --with-build-number
erikj
parents:
20273
diff
changeset
|
520 |
|
20363 | 521 |
AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], |
522 |
[Set build number value for build @<:@b00@:>@])]) |
|
523 |
if test "x$with_build_number" = xyes; then |
|
524 |
AC_MSG_ERROR([Build number must have a value]) |
|
525 |
elif test "x$with_build_number" != x; then |
|
526 |
JDK_BUILD_NUMBER="$with_build_number" |
|
20275
bdf86ab49b78
8005924: Make it possible to set both --with-user-release-suffix and --with-build-number
erikj
parents:
20273
diff
changeset
|
527 |
fi |
20363 | 528 |
# Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set |
529 |
if test "x$JDK_BUILD_NUMBER" = x; then |
|
530 |
JDK_BUILD_NUMBER=b00 |
|
531 |
if test "x$USER_RELEASE_SUFFIX" = x; then |
|
532 |
BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` |
|
533 |
# Avoid [:alnum:] since it depends on the locale. |
|
27133
c3c0d0e3db8d
8061301: Fix typo when translating characters in $USER
erikj
parents:
26546
diff
changeset
|
534 |
CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'` |
20363 | 535 |
USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
536 |
fi |
|
537 |
fi |
|
15055
25fc052ccadd
8001895: build-infra: Make JDK_BUILD_NUMBER and MILESTONE customizable
erikj
parents:
15054
diff
changeset
|
538 |
|
20363 | 539 |
# Now set the JDK version, milestone, build number etc. |
540 |
AC_SUBST(USER_RELEASE_SUFFIX) |
|
541 |
AC_SUBST(JDK_MAJOR_VERSION) |
|
542 |
AC_SUBST(JDK_MINOR_VERSION) |
|
543 |
AC_SUBST(JDK_MICRO_VERSION) |
|
544 |
AC_SUBST(JDK_UPDATE_VERSION) |
|
545 |
AC_SUBST(JDK_BUILD_NUMBER) |
|
546 |
AC_SUBST(MILESTONE) |
|
547 |
AC_SUBST(LAUNCHER_NAME) |
|
548 |
AC_SUBST(PRODUCT_NAME) |
|
549 |
AC_SUBST(PRODUCT_SUFFIX) |
|
550 |
AC_SUBST(JDK_RC_PLATFORM_NAME) |
|
551 |
AC_SUBST(COMPANY_NAME) |
|
552 |
AC_SUBST(MACOSX_BUNDLE_NAME_BASE) |
|
553 |
AC_SUBST(MACOSX_BUNDLE_ID_BASE) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
554 |
|
27584
01a719b65d1e
8065183: Add --with-copyright-year option to configure
erikj
parents:
27133
diff
changeset
|
555 |
AC_ARG_WITH(copyright-year, [AS_HELP_STRING([--with-copyright-year], |
01a719b65d1e
8065183: Add --with-copyright-year option to configure
erikj
parents:
27133
diff
changeset
|
556 |
[Set copyright year value for build @<:@current year@:>@])]) |
01a719b65d1e
8065183: Add --with-copyright-year option to configure
erikj
parents:
27133
diff
changeset
|
557 |
if test "x$with_copyright_year" = xyes; then |
01a719b65d1e
8065183: Add --with-copyright-year option to configure
erikj
parents:
27133
diff
changeset
|
558 |
AC_MSG_ERROR([Copyright year must have a value]) |
01a719b65d1e
8065183: Add --with-copyright-year option to configure
erikj
parents:
27133
diff
changeset
|
559 |
elif test "x$with_copyright_year" != x; then |
01a719b65d1e
8065183: Add --with-copyright-year option to configure
erikj
parents:
27133
diff
changeset
|
560 |
COPYRIGHT_YEAR="$with_copyright_year" |
01a719b65d1e
8065183: Add --with-copyright-year option to configure
erikj
parents:
27133
diff
changeset
|
561 |
else |
01a719b65d1e
8065183: Add --with-copyright-year option to configure
erikj
parents:
27133
diff
changeset
|
562 |
COPYRIGHT_YEAR=`date +'%Y'` |
01a719b65d1e
8065183: Add --with-copyright-year option to configure
erikj
parents:
27133
diff
changeset
|
563 |
fi |
20363 | 564 |
AC_SUBST(COPYRIGHT_YEAR) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
565 |
|
20363 | 566 |
if test "x$JDK_UPDATE_VERSION" != x; then |
567 |
JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" |
|
568 |
else |
|
569 |
JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" |
|
570 |
fi |
|
571 |
AC_SUBST(JDK_VERSION) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
572 |
|
20363 | 573 |
COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` |
574 |
AC_SUBST(COOKED_BUILD_NUMBER) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
575 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
576 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
577 |
AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
578 |
[ |
20363 | 579 |
HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET" |
580 |
AC_SUBST(HOTSPOT_MAKE_ARGS) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
581 |
|
20363 | 582 |
# The name of the Service Agent jar. |
583 |
SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}" |
|
584 |
if test "x$OPENJDK_TARGET_OS" = "xwindows"; then |
|
585 |
SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}" |
|
586 |
fi |
|
587 |
AC_SUBST(SALIB_NAME) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
588 |
]) |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
589 |
|
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
590 |
AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS], |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
591 |
[ |
20363 | 592 |
# |
593 |
# ENABLE_DEBUG_SYMBOLS |
|
594 |
# This must be done after the toolchain is setup, since we're looking at objcopy. |
|
595 |
# |
|
596 |
AC_ARG_ENABLE([debug-symbols], |
|
597 |
[AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
598 |
|
20363 | 599 |
AC_MSG_CHECKING([if we should generate debug symbols]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
600 |
|
20363 | 601 |
if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then |
602 |
# explicit enabling of enable-debug-symbols and can't find objcopy |
|
603 |
# this is an error |
|
604 |
AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols]) |
|
605 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
606 |
|
20363 | 607 |
if test "x$enable_debug_symbols" = "xyes"; then |
14615
2616975e69d3
8001753: build-infra: mismatch with full debug symbol control for hotspot
erikj
parents:
14112
diff
changeset
|
608 |
ENABLE_DEBUG_SYMBOLS=true |
20363 | 609 |
elif test "x$enable_debug_symbols" = "xno"; then |
610 |
ENABLE_DEBUG_SYMBOLS=false |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
611 |
else |
21057
6cfd8ccbfbbc
8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents:
20641
diff
changeset
|
612 |
# Default is on if objcopy is found |
6cfd8ccbfbbc
8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents:
20641
diff
changeset
|
613 |
if test "x$OBJCOPY" != x; then |
6cfd8ccbfbbc
8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents:
20641
diff
changeset
|
614 |
ENABLE_DEBUG_SYMBOLS=true |
6cfd8ccbfbbc
8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents:
20641
diff
changeset
|
615 |
# MacOS X and Windows don't use objcopy but default is on for those OSes |
6cfd8ccbfbbc
8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
dcubed
parents:
20641
diff
changeset
|
616 |
elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then |
20363 | 617 |
ENABLE_DEBUG_SYMBOLS=true |
618 |
else |
|
619 |
ENABLE_DEBUG_SYMBOLS=false |
|
620 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
621 |
fi |
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
622 |
|
20363 | 623 |
AC_MSG_RESULT([$ENABLE_DEBUG_SYMBOLS]) |
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
624 |
|
20363 | 625 |
# |
626 |
# ZIP_DEBUGINFO_FILES |
|
627 |
# |
|
628 |
AC_MSG_CHECKING([if we should zip debug-info files]) |
|
629 |
AC_ARG_ENABLE([zip-debug-info], |
|
630 |
[AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])], |
|
631 |
[enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"]) |
|
632 |
AC_MSG_RESULT([${enable_zip_debug_info}]) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
633 |
|
20363 | 634 |
if test "x${enable_zip_debug_info}" = "xno"; then |
635 |
ZIP_DEBUGINFO_FILES=false |
|
636 |
else |
|
637 |
ZIP_DEBUGINFO_FILES=true |
|
638 |
fi |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
639 |
|
20363 | 640 |
AC_SUBST(ENABLE_DEBUG_SYMBOLS) |
641 |
AC_SUBST(ZIP_DEBUGINFO_FILES) |
|
13133
701e61c32ece
7182051: Update of latest build-infra Makefiles (missing files)
erikj
parents:
diff
changeset
|
642 |
]) |
29305
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
643 |
|
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
644 |
################################################################################ |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
645 |
# |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
646 |
# Gcov coverage data for hotspot |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
647 |
# |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
648 |
AC_DEFUN_ONCE([JDKOPT_SETUP_CODE_COVERAGE], |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
649 |
[ |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
650 |
AC_ARG_ENABLE(native-coverage, [AS_HELP_STRING([--enable-native-coverage], |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
651 |
[enable native compilation with code coverage data@<:@disabled@:>@])]) |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
652 |
GCOV_ENABLED="false" |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
653 |
if test "x$enable_native_coverage" = "xyes"; then |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
654 |
if test "x$TOOLCHAIN_TYPE" = "xgcc"; then |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
655 |
AC_MSG_CHECKING([if native coverage is enabled]) |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
656 |
AC_MSG_RESULT([yes]) |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
657 |
GCOV_CFLAGS="-fprofile-arcs -ftest-coverage -fno-inline" |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
658 |
GCOV_LDFLAGS="-fprofile-arcs" |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
659 |
LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $GCOV_CFLAGS" |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
660 |
LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $GCOV_CFLAGS" |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
661 |
LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $GCOV_LDFLAGS" |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
662 |
CFLAGS_JDKLIB="$CFLAGS_JDKLIB $GCOV_CFLAGS" |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
663 |
CFLAGS_JDKEXE="$CFLAGS_JDKEXE $GCOV_CFLAGS" |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
664 |
CXXFLAGS_JDKLIB="$CXXFLAGS_JDKLIB $GCOV_CFLAGS" |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
665 |
CXXFLAGS_JDKEXE="$CXXFLAGS_JDKEXE $GCOV_CFLAGS" |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
666 |
LDFLAGS_JDKLIB="$LDFLAGS_JDKLIB $GCOV_LDFLAGS" |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
667 |
LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE $GCOV_LDFLAGS" |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
668 |
GCOV_ENABLED="true" |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
669 |
else |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
670 |
AC_MSG_ERROR([--enable-native-coverage only works with toolchain type gcc]) |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
671 |
fi |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
672 |
elif test "x$enable_native_coverage" = "xno"; then |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
673 |
AC_MSG_CHECKING([if native coverage is enabled]) |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
674 |
AC_MSG_RESULT([no]) |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
675 |
elif test "x$enable_native_coverage" != "x"; then |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
676 |
AC_MSG_ERROR([--enable-native-coverage can only be assigned "yes" or "no"]) |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
677 |
fi |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
678 |
|
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
679 |
AC_SUBST(GCOV_ENABLED) |
4ddc6faf7842
8073021: add native code coverage target into makefiles
erikj
parents:
29162
diff
changeset
|
680 |
]) |