Mercurial > jdk8-mips64-public / file comparison

comparison: common/autoconf/jdk-options.m4

common/autoconf/jdk-options.m4

changeset 972
f3697e0783e2
parent 965
3ef3f4174c2b
parent 874
dfbc93f26f38
child 1028
feeb67be5886
equal deleted inserted replaced
971:584dc2e95e04 972:f3697e0783e2
23 # questions. 23 # questions.
24 # 24 #
25 25
26 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VARIANT], 26 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VARIANT],
27 [ 27 [
28 ############################################################################### 28 ###############################################################################
29 # 29 #
30 # Check which variant of the JDK that we want to build. 30 # Check which variant of the JDK that we want to build.
31 # Currently we have: 31 # Currently we have:
32 # normal: standard edition 32 # normal: standard edition
33 # but the custom make system may add other variants 33 # but the custom make system may add other variants
34 # 34 #
35 # Effectively the JDK variant gives a name to a specific set of 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 36 # modules to compile into the JDK. In the future, these modules
37 # might even be Jigsaw modules. 37 # might even be Jigsaw modules.
38 # 38 #
39 AC_MSG_CHECKING([which variant of the JDK to build]) 39 AC_MSG_CHECKING([which variant of the JDK to build])
40 AC_ARG_WITH([jdk-variant], [AS_HELP_STRING([--with-jdk-variant], 40 AC_ARG_WITH([jdk-variant], [AS_HELP_STRING([--with-jdk-variant],
41 [JDK variant to build (normal) @<:@normal@:>@])]) 41 [JDK variant to build (normal) @<:@normal@:>@])])
42 42
43 if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then 43 if test "x$with_jdk_variant" = xnormal || test "x$with_jdk_variant" = x; then
44 JDK_VARIANT="normal" 44 JDK_VARIANT="normal"
45 else 45 else
46 AC_MSG_ERROR([The available JDK variants are: normal]) 46 AC_MSG_ERROR([The available JDK variants are: normal])
47 fi 47 fi
48 48
49 AC_SUBST(JDK_VARIANT) 49 AC_SUBST(JDK_VARIANT)
50 50
51 AC_MSG_RESULT([$JDK_VARIANT]) 51 AC_MSG_RESULT([$JDK_VARIANT])
52 ]) 52 ])
53 53
54 AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_INTERPRETER], 54 AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_INTERPRETER],
55 [ 55 [
56 ############################################################################### 56 ###############################################################################
79 ]) 79 ])
80 80
81 AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS], 81 AC_DEFUN_ONCE([JDKOPT_SETUP_JVM_VARIANTS],
82 [ 82 [
83 83
84 ############################################################################### 84 ###############################################################################
85 # 85 #
86 # Check which variants of the JVM that we want to build. 86 # Check which variants of the JVM that we want to build.
87 # Currently we have: 87 # Currently we have:
88 # server: normal interpreter and a tiered C1/C2 compiler 88 # server: normal interpreter and a tiered C1/C2 compiler
89 # client: normal interpreter and C1 (no C2 compiler) (only 32-bit platforms) 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 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, 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 92 # ie normal interpreter and C1, only the serial GC, kernel jvmti etc
93 # zero: no machine code interpreter, no compiler 93 # zero: no machine code interpreter, no compiler
94 # zeroshark: zero interpreter and shark/llvm compiler backend 94 # zeroshark: zero interpreter and shark/llvm compiler backend
95 # core: interpreter only, no compiler (only works on some platforms) 95 # core: interpreter only, no compiler (only works on some platforms)
96 AC_MSG_CHECKING([which variants of the JVM to build]) 96 AC_MSG_CHECKING([which variants of the JVM to build])
97 AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants], 97 AC_ARG_WITH([jvm-variants], [AS_HELP_STRING([--with-jvm-variants],
98 [JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark, core) @<:@server@:>@])]) 98 [JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark, core) @<:@server@:>@])])
99 99
100 if test "x$with_jvm_variants" = x; then 100 if test "x$with_jvm_variants" = x; then
101 with_jvm_variants="server" 101 with_jvm_variants="server"
102 fi 102 fi
103 103
104 JVM_VARIANTS=",$with_jvm_variants," 104 JVM_VARIANTS=",$with_jvm_variants,"
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,//'` 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,//'`
106 106
107 if test "x$TEST_VARIANTS" != "x,"; then 107 if test "x$TEST_VARIANTS" != "x,"; then
108 AC_MSG_ERROR([The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark, core]) 108 AC_MSG_ERROR([The available JVM variants are: server, client, minimal1, kernel, zero, zeroshark, core])
109 fi 109 fi
110 AC_MSG_RESULT([$with_jvm_variants]) 110 AC_MSG_RESULT([$with_jvm_variants])
111 111
112 JVM_VARIANT_SERVER=`$ECHO "$JVM_VARIANTS" | $SED -e '/,server,/!s/.*/false/g' -e '/,server,/s/.*/true/g'` 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'` 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'` 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'` 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'` 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'` 117 JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'`
118 JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'` 118 JVM_VARIANT_CORE=`$ECHO "$JVM_VARIANTS" | $SED -e '/,core,/!s/.*/false/g' -e '/,core,/s/.*/true/g'`
119 119
120 if test "x$JVM_VARIANT_CLIENT" = xtrue; then 120 if test "x$JVM_VARIANT_CLIENT" = xtrue; then
121 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 121 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
122 AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.]) 122 AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.])
123 fi 123 fi
124 fi 124 fi
125 if test "x$JVM_VARIANT_KERNEL" = xtrue; then 125 if test "x$JVM_VARIANT_KERNEL" = xtrue; then
126 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 126 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
127 AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.]) 127 AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.])
128 fi 128 fi
129 fi 129 fi
130 if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then 130 if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
131 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then 131 if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then
132 AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.]) 132 AC_MSG_ERROR([You cannot build a minimal JVM for a 64-bit machine.])
133 fi 133 fi
134 fi 134 fi
135 135
136 # Replace the commas with AND for use in the build directory name. 136 # Replace the commas with AND for use in the build directory name.
137 ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'` 137 ANDED_JVM_VARIANTS=`$ECHO "$JVM_VARIANTS" | $SED -e 's/^,//' -e 's/,$//' -e 's/,/AND/'`
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/'` 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/'`
139 if test "x$COUNT_VARIANTS" != "x,1"; then 139 if test "x$COUNT_VARIANTS" != "x,1"; then
140 BUILDING_MULTIPLE_JVM_VARIANTS=yes 140 BUILDING_MULTIPLE_JVM_VARIANTS=yes
141 else 141 else
142 BUILDING_MULTIPLE_JVM_VARIANTS=no 142 BUILDING_MULTIPLE_JVM_VARIANTS=no
143 fi 143 fi
144 144
145 AC_SUBST(JVM_VARIANTS) 145 AC_SUBST(JVM_VARIANTS)
146 AC_SUBST(JVM_VARIANT_SERVER) 146 AC_SUBST(JVM_VARIANT_SERVER)
147 AC_SUBST(JVM_VARIANT_CLIENT) 147 AC_SUBST(JVM_VARIANT_CLIENT)
148 AC_SUBST(JVM_VARIANT_MINIMAL1) 148 AC_SUBST(JVM_VARIANT_MINIMAL1)
149 AC_SUBST(JVM_VARIANT_KERNEL) 149 AC_SUBST(JVM_VARIANT_KERNEL)
150 AC_SUBST(JVM_VARIANT_ZERO) 150 AC_SUBST(JVM_VARIANT_ZERO)
151 AC_SUBST(JVM_VARIANT_ZEROSHARK) 151 AC_SUBST(JVM_VARIANT_ZEROSHARK)
152 AC_SUBST(JVM_VARIANT_CORE) 152 AC_SUBST(JVM_VARIANT_CORE)
153 153
154 INCLUDE_SA=true 154 INCLUDE_SA=true
155 if test "x$JVM_VARIANT_ZERO" = xtrue ; then 155 if test "x$JVM_VARIANT_ZERO" = xtrue ; then
156 INCLUDE_SA=false 156 INCLUDE_SA=false
157 fi 157 fi
158 if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then 158 if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
159 INCLUDE_SA=false 159 INCLUDE_SA=false
160 fi 160 fi
161 if test "x$VAR_CPU" = xppc64 ; then 161 if test "x$VAR_CPU" = xppc64 ; then
162 INCLUDE_SA=false 162 INCLUDE_SA=false
163 fi 163 fi
164 AC_SUBST(INCLUDE_SA) 164 AC_SUBST(INCLUDE_SA)
165 165
166 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 166 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
167 MACOSX_UNIVERSAL="true" 167 MACOSX_UNIVERSAL="true"
168 fi 168 fi
169 169
170 AC_SUBST(MACOSX_UNIVERSAL) 170 AC_SUBST(MACOSX_UNIVERSAL)
171
172 ]) 171 ])
173 172
174 AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_LEVEL], 173 AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_LEVEL],
175 [ 174 [
176 ############################################################################### 175 ###############################################################################
177 # 176 #
178 # Set the debug level 177 # Set the debug level
179 # release: no debug information, all optimizations, no asserts. 178 # release: no debug information, all optimizations, no asserts.
180 # fastdebug: debug information (-g), all optimizations, all asserts 179 # fastdebug: debug information (-g), all optimizations, all asserts
181 # slowdebug: debug information (-g), no optimizations, all asserts 180 # slowdebug: debug information (-g), no optimizations, all asserts
182 # 181 #
183 DEBUG_LEVEL="release" 182 DEBUG_LEVEL="release"
184 AC_MSG_CHECKING([which debug level to use]) 183 AC_MSG_CHECKING([which debug level to use])
185 AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug], 184 AC_ARG_ENABLE([debug], [AS_HELP_STRING([--enable-debug],
186 [set the debug level to fastdebug (shorthand for --with-debug-level=fastdebug) @<:@disabled@:>@])], 185 [set the debug level to fastdebug (shorthand for --with-debug-level=fastdebug) @<:@disabled@:>@])],
187 [ 186 [
188 ENABLE_DEBUG="${enableval}" 187 ENABLE_DEBUG="${enableval}"
189 DEBUG_LEVEL="fastdebug" 188 DEBUG_LEVEL="fastdebug"
190 ], [ENABLE_DEBUG="no"]) 189 ], [ENABLE_DEBUG="no"])
191 190
192 AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level], 191 AC_ARG_WITH([debug-level], [AS_HELP_STRING([--with-debug-level],
193 [set the debug level (release, fastdebug, slowdebug) @<:@release@:>@])], 192 [set the debug level (release, fastdebug, slowdebug) @<:@release@:>@])],
194 [ 193 [
195 DEBUG_LEVEL="${withval}" 194 DEBUG_LEVEL="${withval}"
196 if test "x$ENABLE_DEBUG" = xyes; then 195 if test "x$ENABLE_DEBUG" = xyes; then
197 AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.]) 196 AC_MSG_ERROR([You cannot use both --enable-debug and --with-debug-level at the same time.])
198 fi 197 fi
199 ]) 198 ])
200 AC_MSG_RESULT([$DEBUG_LEVEL]) 199 AC_MSG_RESULT([$DEBUG_LEVEL])
201 200
202 if test "x$DEBUG_LEVEL" != xrelease && \ 201 if test "x$DEBUG_LEVEL" != xrelease && \
203 test "x$DEBUG_LEVEL" != xfastdebug && \ 202 test "x$DEBUG_LEVEL" != xfastdebug && \
204 test "x$DEBUG_LEVEL" != xslowdebug; then 203 test "x$DEBUG_LEVEL" != xslowdebug; then
205 AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug]) 204 AC_MSG_ERROR([Allowed debug levels are: release, fastdebug and slowdebug])
206 fi 205 fi
206
207
208 ###############################################################################
209 #
210 # Setup legacy vars/targets and new vars to deal with different debug levels.
211 #
212
213 case $DEBUG_LEVEL in
214 release )
215 VARIANT="OPT"
216 FASTDEBUG="false"
217 DEBUG_CLASSFILES="false"
218 BUILD_VARIANT_RELEASE=""
219 HOTSPOT_DEBUG_LEVEL="product"
220 HOTSPOT_EXPORT="product"
221 ;;
222 fastdebug )
223 VARIANT="DBG"
224 FASTDEBUG="true"
225 DEBUG_CLASSFILES="true"
226 BUILD_VARIANT_RELEASE="-fastdebug"
227 HOTSPOT_DEBUG_LEVEL="fastdebug"
228 HOTSPOT_EXPORT="fastdebug"
229 ;;
230 slowdebug )
231 VARIANT="DBG"
232 FASTDEBUG="false"
233 DEBUG_CLASSFILES="true"
234 BUILD_VARIANT_RELEASE="-debug"
235 HOTSPOT_DEBUG_LEVEL="jvmg"
236 HOTSPOT_EXPORT="debug"
237 ;;
238 esac
239
240 #####
241 # Generate the legacy makefile targets for hotspot.
242 # The hotspot api for selecting the build artifacts, really, needs to be improved.
243 # JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
244 # determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
245 # But until then ...
246 HOTSPOT_TARGET=""
247
248 if test "x$JVM_VARIANT_SERVER" = xtrue; then
249 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} "
250 fi
251
252 if test "x$JVM_VARIANT_CLIENT" = xtrue; then
253 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 "
254 fi
255
256 if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
257 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 "
258 fi
259
260 if test "x$JVM_VARIANT_KERNEL" = xtrue; then
261 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel "
262 fi
263
264 if test "x$JVM_VARIANT_ZERO" = xtrue; then
265 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
266 fi
267
268 if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
269 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
270 fi
271
272 if test "x$JVM_VARIANT_CORE" = xtrue; then
273 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core "
274 fi
275
276 HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
277
278 # On Macosx universal binaries are produced, but they only contain
279 # 64 bit intel. This invalidates control of which jvms are built
280 # from configure, but only server is valid anyway. Fix this
281 # when hotspot makefiles are rewritten.
282 if test "x$MACOSX_UNIVERSAL" = xtrue; then
283 HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
284 fi
285
286 #####
287
288 AC_SUBST(DEBUG_LEVEL)
289 AC_SUBST(VARIANT)
290 AC_SUBST(FASTDEBUG)
291 AC_SUBST(DEBUG_CLASSFILES)
292 AC_SUBST(BUILD_VARIANT_RELEASE)
293 ])
207 294
208 295
209 ############################################################################### 296 ###############################################################################
210 # 297 #
211 # Setup legacy vars/targets and new vars to deal with different debug levels.
212 #
213
214 case $DEBUG_LEVEL in
215 release )
216 VARIANT="OPT"
217 FASTDEBUG="false"
218 DEBUG_CLASSFILES="false"
219 BUILD_VARIANT_RELEASE=""
220 HOTSPOT_DEBUG_LEVEL="product"
221 HOTSPOT_EXPORT="product"
222 ;;
223 fastdebug )
224 VARIANT="DBG"
225 FASTDEBUG="true"
226 DEBUG_CLASSFILES="true"
227 BUILD_VARIANT_RELEASE="-fastdebug"
228 HOTSPOT_DEBUG_LEVEL="fastdebug"
229 HOTSPOT_EXPORT="fastdebug"
230 ;;
231 slowdebug )
232 VARIANT="DBG"
233 FASTDEBUG="false"
234 DEBUG_CLASSFILES="true"
235 BUILD_VARIANT_RELEASE="-debug"
236 HOTSPOT_DEBUG_LEVEL="jvmg"
237 HOTSPOT_EXPORT="debug"
238 ;;
239 esac
240
241 #####
242 # Generate the legacy makefile targets for hotspot.
243 # The hotspot api for selecting the build artifacts, really, needs to be improved.
244 # JDK-7195896 will fix this on the hotspot side by using the JVM_VARIANT_* variables to
245 # determine what needs to be built. All we will need to set here is all_product, all_fastdebug etc
246 # But until then ...
247 HOTSPOT_TARGET=""
248
249 if test "x$JVM_VARIANT_SERVER" = xtrue; then
250 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL} "
251 fi
252
253 if test "x$JVM_VARIANT_CLIENT" = xtrue; then
254 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}1 "
255 fi
256
257 if test "x$JVM_VARIANT_MINIMAL1" = xtrue; then
258 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}minimal1 "
259 fi
260
261 if test "x$JVM_VARIANT_KERNEL" = xtrue; then
262 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}kernel "
263 fi
264
265 if test "x$JVM_VARIANT_ZERO" = xtrue; then
266 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}zero "
267 fi
268
269 if test "x$JVM_VARIANT_ZEROSHARK" = xtrue; then
270 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}shark "
271 fi
272
273 if test "x$JVM_VARIANT_CORE" = xtrue; then
274 HOTSPOT_TARGET="$HOTSPOT_TARGET${HOTSPOT_DEBUG_LEVEL}core "
275 fi
276
277 HOTSPOT_TARGET="$HOTSPOT_TARGET docs export_$HOTSPOT_EXPORT"
278
279 # On Macosx universal binaries are produced, but they only contain
280 # 64 bit intel. This invalidates control of which jvms are built
281 # from configure, but only server is valid anyway. Fix this
282 # when hotspot makefiles are rewritten.
283 if test "x$MACOSX_UNIVERSAL" = xtrue; then
284 HOTSPOT_TARGET=universal_${HOTSPOT_EXPORT}
285 fi
286
287 #####
288
289 AC_SUBST(DEBUG_LEVEL)
290 AC_SUBST(VARIANT)
291 AC_SUBST(FASTDEBUG)
292 AC_SUBST(DEBUG_CLASSFILES)
293 AC_SUBST(BUILD_VARIANT_RELEASE)
294 ])
295
296
297 ###############################################################################
298 #
299 # Should we build only OpenJDK even if closed sources are present? 298 # Should we build only OpenJDK even if closed sources are present?
300 # 299 #
301 AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM], 300 AC_DEFUN_ONCE([JDKOPT_SETUP_OPEN_OR_CUSTOM],
302 [ 301 [
303 AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only], 302 AC_ARG_ENABLE([openjdk-only], [AS_HELP_STRING([--enable-openjdk-only],
304 [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"]) 303 [suppress building custom source even if present @<:@disabled@:>@])],,[enable_openjdk_only="no"])
305 304
306 AC_MSG_CHECKING([for presence of closed sources]) 305 AC_MSG_CHECKING([for presence of closed sources])
307 if test -d "$SRC_ROOT/jdk/src/closed"; then 306 if test -d "$SRC_ROOT/jdk/src/closed"; then
308 CLOSED_SOURCE_PRESENT=yes 307 CLOSED_SOURCE_PRESENT=yes
309 else 308 else
336 ]) 335 ])
337 336
338 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], 337 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS],
339 [ 338 [
340 339
341 ############################################################################### 340 ###############################################################################
342 # 341 #
343 # Should we build a JDK/JVM with headful support (ie a graphical ui)? 342 # Should we build a JDK/JVM with headful support (ie a graphical ui)?
344 # We always build headless support. 343 # We always build headless support.
345 # 344 #
346 AC_MSG_CHECKING([headful support]) 345 AC_MSG_CHECKING([headful support])
347 AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful], 346 AC_ARG_ENABLE([headful], [AS_HELP_STRING([--disable-headful],
348 [disable building headful support (graphical UI support) @<:@enabled@:>@])], 347 [disable building headful support (graphical UI support) @<:@enabled@:>@])],
349 [SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes]) 348 [SUPPORT_HEADFUL=${enable_headful}], [SUPPORT_HEADFUL=yes])
350 349
351 SUPPORT_HEADLESS=yes 350 SUPPORT_HEADLESS=yes
352 BUILD_HEADLESS="BUILD_HEADLESS:=true" 351 BUILD_HEADLESS="BUILD_HEADLESS:=true"
353 352
354 if test "x$SUPPORT_HEADFUL" = xyes; then 353 if test "x$SUPPORT_HEADFUL" = xyes; then
355 # We are building both headful and headless. 354 # We are building both headful and headless.
356 headful_msg="inlude support for both headful and headless" 355 headful_msg="include support for both headful and headless"
357 fi 356 fi
358 357
359 if test "x$SUPPORT_HEADFUL" = xno; then 358 if test "x$SUPPORT_HEADFUL" = xno; then
360 # Thus we are building headless only. 359 # Thus we are building headless only.
361 BUILD_HEADLESS="BUILD_HEADLESS:=true" 360 BUILD_HEADLESS="BUILD_HEADLESS:=true"
362 headful_msg="headless only" 361 headful_msg="headless only"
363 fi 362 fi
364 363
365 AC_MSG_RESULT([$headful_msg]) 364 AC_MSG_RESULT([$headful_msg])
366 365
367 AC_SUBST(SUPPORT_HEADLESS) 366 AC_SUBST(SUPPORT_HEADLESS)
368 AC_SUBST(SUPPORT_HEADFUL) 367 AC_SUBST(SUPPORT_HEADFUL)
369 AC_SUBST(BUILD_HEADLESS) 368 AC_SUBST(BUILD_HEADLESS)
370 369
371 # Control wether Hotspot runs Queens test after build. 370 # Control wether Hotspot runs Queens test after build.
372 AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build], 371 AC_ARG_ENABLE([hotspot-test-in-build], [AS_HELP_STRING([--enable-hotspot-test-in-build],
373 [run the Queens test after Hotspot build @<:@disabled@:>@])],, 372 [run the Queens test after Hotspot build @<:@disabled@:>@])],,
374 [enable_hotspot_test_in_build=no]) 373 [enable_hotspot_test_in_build=no])
375 if test "x$enable_hotspot_test_in_build" = "xyes"; then 374 if test "x$enable_hotspot_test_in_build" = "xyes"; then
376 TEST_IN_BUILD=true 375 TEST_IN_BUILD=true
377 else 376 else
378 TEST_IN_BUILD=false 377 TEST_IN_BUILD=false
379 fi 378 fi
380 AC_SUBST(TEST_IN_BUILD) 379 AC_SUBST(TEST_IN_BUILD)
380
381 ###############################################################################
382 #
383 # Choose cacerts source file
384 #
385 AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file],
386 [specify alternative cacerts file])])
387 if test "x$with_cacerts_file" != x; then
388 CACERTS_FILE=$with_cacerts_file
389 else
390 CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
391 fi
392 AC_SUBST(CACERTS_FILE)
393
394 ###############################################################################
395 #
396 # Enable or disable unlimited crypto
397 #
398 AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--enable-unlimited-crypto],
399 [Enable unlimited crypto policy @<:@disabled@:>@])],,
400 [enable_unlimited_crypto=no])
401 if test "x$enable_unlimited_crypto" = "xyes"; then
402 UNLIMITED_CRYPTO=true
403 else
404 UNLIMITED_CRYPTO=false
405 fi
406 AC_SUBST(UNLIMITED_CRYPTO)
407
408 ###############################################################################
409 #
410 # Enable or disable the elliptic curve crypto implementation
411 #
412 AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
413 [
414 AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
415
416 if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
417 ENABLE_INTREE_EC=yes
418 AC_MSG_RESULT([yes])
419 else
420 ENABLE_INTREE_EC=no
421 AC_MSG_RESULT([no])
422 fi
423
424 AC_SUBST(ENABLE_INTREE_EC)
425 ])
426
427 ###############################################################################
428 #
429 # Compress jars
430 #
431 COMPRESS_JARS=false
432
433 AC_SUBST(COMPRESS_JARS)
434 ])
381 435
382 ############################################################################### 436 ###############################################################################
383 # 437 #
384 # Choose cacerts source file
385 #
386 AC_ARG_WITH(cacerts-file, [AS_HELP_STRING([--with-cacerts-file],
387 [specify alternative cacerts file])])
388 if test "x$with_cacerts_file" != x; then
389 CACERTS_FILE=$with_cacerts_file
390 else
391 CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
392 fi
393 AC_SUBST(CACERTS_FILE)
394
395 ###############################################################################
396 #
397 # Enable or disable unlimited crypto
398 #
399 AC_ARG_ENABLE(unlimited-crypto, [AS_HELP_STRING([--enable-unlimited-crypto],
400 [Enable unlimited crypto policy @<:@disabled@:>@])],,
401 [enable_unlimited_crypto=no])
402 if test "x$enable_unlimited_crypto" = "xyes"; then
403 UNLIMITED_CRYPTO=true
404 else
405 UNLIMITED_CRYPTO=false
406 fi
407 AC_SUBST(UNLIMITED_CRYPTO)
408
409 ###############################################################################
410 #
411 # Enable or disable the elliptic curve crypto implementation
412 #
413 AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
414 [
415 AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
416
417 if test -d "${SRC_ROOT}/jdk/src/share/native/sun/security/ec/impl"; then
418 ENABLE_INTREE_EC=yes
419 AC_MSG_RESULT([yes])
420 else
421 ENABLE_INTREE_EC=no
422 AC_MSG_RESULT([no])
423 fi
424
425 AC_SUBST(ENABLE_INTREE_EC)
426 ])
427
428 ###############################################################################
429 #
430 # Compress jars
431 #
432 COMPRESS_JARS=false
433
434 AC_SUBST(COMPRESS_JARS)
435 ])
436
437 ###############################################################################
438 #
439 # Setup version numbers 438 # Setup version numbers
440 # 439 #
441 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS], 440 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
442 [ 441 [
443 # Source the version numbers 442 # Source the version numbers
444 . $AUTOCONF_DIR/version-numbers 443 . $AUTOCONF_DIR/version-numbers
445 444
446 # Get the settings from parameters 445 # Get the settings from parameters
447 AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone], 446 AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone],
448 [Set milestone value for build @<:@internal@:>@])]) 447 [Set milestone value for build @<:@internal@:>@])])
449 if test "x$with_milestone" = xyes; then 448 if test "x$with_milestone" = xyes; then
450 AC_MSG_ERROR([Milestone must have a value]) 449 AC_MSG_ERROR([Milestone must have a value])
451 elif test "x$with_milestone" != x; then 450 elif test "x$with_milestone" != x; then
452 MILESTONE="$with_milestone" 451 MILESTONE="$with_milestone"
453 fi 452 fi
454 if test "x$MILESTONE" = x; then 453 if test "x$MILESTONE" = x; then
455 MILESTONE=internal 454 MILESTONE=internal
456 fi 455 fi
457 456
458 AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version], 457 AC_ARG_WITH(update-version, [AS_HELP_STRING([--with-update-version],
459 [Set update version value for build @<:@b00@:>@])]) 458 [Set update version value for build @<:@b00@:>@])])
460 if test "x$with_update_version" = xyes; then 459 if test "x$with_update_version" = xyes; then
461 AC_MSG_ERROR([Update version must have a value]) 460 AC_MSG_ERROR([Update version must have a value])
462 elif test "x$with_update_version" != x; then 461 elif test "x$with_update_version" != x; then
463 JDK_UPDATE_VERSION="$with_update_version" 462 JDK_UPDATE_VERSION="$with_update_version"
464 fi 463 fi
465 464
466 AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], 465 AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
467 [Set build number value for build @<:@b00@:>@])]) 466 [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
468 if test "x$with_build_number" = xyes; then 467 if test "x$with_user_release_suffix" = xyes; then
469 AC_MSG_ERROR([Build number must have a value]) 468 AC_MSG_ERROR([Release suffix must have a value])
470 elif test "x$with_build_number" != x; then 469 elif test "x$with_user_release_suffix" != x; then
471 JDK_BUILD_NUMBER="$with_build_number" 470 USER_RELEASE_SUFFIX="$with_user_release_suffix"
472 fi 471 fi
473 if test "x$JDK_BUILD_NUMBER" = x; then 472
474 JDK_BUILD_NUMBER=b00 473 AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number],
475 fi 474 [Set build number value for build @<:@b00@:>@])])
476 475 if test "x$with_build_number" = xyes; then
477 AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix], 476 AC_MSG_ERROR([Build number must have a value])
478 [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])]) 477 elif test "x$with_build_number" != x; then
479 if test "x$with_user_release_suffix" = xyes; then 478 JDK_BUILD_NUMBER="$with_build_number"
480 AC_MSG_ERROR([Release suffix must have a value]) 479 fi
481 elif test "x$with_user_release_suffix" != x; then 480 # Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
482 USER_RELEASE_SUFFIX="$with_user_release_suffix" 481 if test "x$JDK_BUILD_NUMBER" = x; then
483 else 482 JDK_BUILD_NUMBER=b00
484 BUILD_DATE=`date '+%Y_%m_%d_%H_%M'` 483 if test "x$USER_RELEASE_SUFFIX" = x; then
485 # Avoid [:alnum:] since it depends on the locale. 484 BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
486 CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'` 485 # Avoid [:alnum:] since it depends on the locale.
487 USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 486 CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
488 fi 487 USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
489 AC_SUBST(USER_RELEASE_SUFFIX) 488 fi
490 489 fi
491 # Now set the JDK version, milestone, build number etc. 490
492 AC_SUBST(JDK_MAJOR_VERSION) 491 # Now set the JDK version, milestone, build number etc.
493 AC_SUBST(JDK_MINOR_VERSION) 492 AC_SUBST(USER_RELEASE_SUFFIX)
494 AC_SUBST(JDK_MICRO_VERSION) 493 AC_SUBST(JDK_MAJOR_VERSION)
495 AC_SUBST(JDK_UPDATE_VERSION) 494 AC_SUBST(JDK_MINOR_VERSION)
496 AC_SUBST(JDK_BUILD_NUMBER) 495 AC_SUBST(JDK_MICRO_VERSION)
497 AC_SUBST(MILESTONE) 496 AC_SUBST(JDK_UPDATE_VERSION)
498 AC_SUBST(LAUNCHER_NAME) 497 AC_SUBST(JDK_BUILD_NUMBER)
499 AC_SUBST(PRODUCT_NAME) 498 AC_SUBST(MILESTONE)
500 AC_SUBST(PRODUCT_SUFFIX) 499 AC_SUBST(LAUNCHER_NAME)
501 AC_SUBST(JDK_RC_PLATFORM_NAME) 500 AC_SUBST(PRODUCT_NAME)
502 AC_SUBST(COMPANY_NAME) 501 AC_SUBST(PRODUCT_SUFFIX)
503 AC_SUBST(MACOSX_BUNDLE_NAME_BASE) 502 AC_SUBST(JDK_RC_PLATFORM_NAME)
504 AC_SUBST(MACOSX_BUNDLE_ID_BASE) 503 AC_SUBST(COMPANY_NAME)
505 504 AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
506 COPYRIGHT_YEAR=`date +'%Y'` 505 AC_SUBST(MACOSX_BUNDLE_ID_BASE)
507 AC_SUBST(COPYRIGHT_YEAR) 506
508 507 COPYRIGHT_YEAR=`date +'%Y'`
509 if test "x$JDK_UPDATE_VERSION" != x; then 508 AC_SUBST(COPYRIGHT_YEAR)
510 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 509
511 else 510 if test "x$JDK_UPDATE_VERSION" != x; then
512 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" 511 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
513 fi 512 else
514 AC_SUBST(JDK_VERSION) 513 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
515 514 fi
516 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` 515 AC_SUBST(JDK_VERSION)
517 AC_SUBST(COOKED_BUILD_NUMBER) 516
517 COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
518 AC_SUBST(COOKED_BUILD_NUMBER)
518 ]) 519 ])
519 520
520 AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS], 521 AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS],
521 [ 522 [
522 HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET" 523 HOTSPOT_MAKE_ARGS="$HOTSPOT_TARGET"
523 AC_SUBST(HOTSPOT_MAKE_ARGS) 524 AC_SUBST(HOTSPOT_MAKE_ARGS)
524 525
525 # The name of the Service Agent jar. 526 # The name of the Service Agent jar.
526 SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}" 527 SALIB_NAME="${LIBRARY_PREFIX}saproc${SHARED_LIBRARY_SUFFIX}"
527 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then 528 if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
528 SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}" 529 SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
529 fi 530 fi
530 AC_SUBST(SALIB_NAME) 531 AC_SUBST(SALIB_NAME)
531
532 ]) 532 ])
533 533
534 AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS], 534 AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],
535 [ 535 [
536 # 536 #
537 # ENABLE_DEBUG_SYMBOLS 537 # ENABLE_DEBUG_SYMBOLS
538 # This must be done after the toolchain is setup, since we're looking at objcopy. 538 # This must be done after the toolchain is setup, since we're looking at objcopy.
539 # 539 #
540 AC_ARG_ENABLE([debug-symbols], 540 AC_ARG_ENABLE([debug-symbols],
541 [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])]) 541 [AS_HELP_STRING([--disable-debug-symbols],[disable generation of debug symbols @<:@enabled@:>@])])
542 542
543 AC_MSG_CHECKING([if we should generate debug symbols]) 543 AC_MSG_CHECKING([if we should generate debug symbols])
544 544
545 if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then 545 if test "x$enable_debug_symbols" = "xyes" && test "x$OBJCOPY" = x; then
546 # explicit enabling of enable-debug-symbols and can't find objcopy 546 # explicit enabling of enable-debug-symbols and can't find objcopy
547 # this is an error 547 # this is an error
548 AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols]) 548 AC_MSG_ERROR([Unable to find objcopy, cannot enable debug-symbols])
549 fi 549 fi
550 550
551 if test "x$enable_debug_symbols" = "xyes"; then 551 if test "x$enable_debug_symbols" = "xyes"; then
552 ENABLE_DEBUG_SYMBOLS=true 552 ENABLE_DEBUG_SYMBOLS=true
553 elif test "x$enable_debug_symbols" = "xno"; then 553 elif test "x$enable_debug_symbols" = "xno"; then
554 ENABLE_DEBUG_SYMBOLS=false
555 else
556 # default on macosx is false
557 if test "x$OPENJDK_TARGET_OS" = xmacosx; then
558 ENABLE_DEBUG_SYMBOLS=false 554 ENABLE_DEBUG_SYMBOLS=false
559 # Default is on if objcopy is found, otherwise off 555 else
560 elif test "x$OBJCOPY" != x || test "x$OPENJDK_TARGET_OS" = xwindows; then 556 # Default is on if objcopy is found
561 ENABLE_DEBUG_SYMBOLS=true 557 if test "x$OBJCOPY" != x; then
562 else 558 ENABLE_DEBUG_SYMBOLS=true
563 ENABLE_DEBUG_SYMBOLS=false 559 # MacOS X and Windows don't use objcopy but default is on for those OSes
564 fi 560 elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then
565 fi 561 ENABLE_DEBUG_SYMBOLS=true
566 562 else
567 AC_MSG_RESULT([$ENABLE_DEBUG_SYMBOLS]) 563 ENABLE_DEBUG_SYMBOLS=false
568 564 fi
569 # 565 fi
570 # ZIP_DEBUGINFO_FILES 566
571 # 567 AC_MSG_RESULT([$ENABLE_DEBUG_SYMBOLS])
572 AC_MSG_CHECKING([if we should zip debug-info files]) 568
573 AC_ARG_ENABLE([zip-debug-info], 569 #
574 [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])], 570 # ZIP_DEBUGINFO_FILES
575 [enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"]) 571 #
576 AC_MSG_RESULT([${enable_zip_debug_info}]) 572 AC_MSG_CHECKING([if we should zip debug-info files])
577 573 AC_ARG_ENABLE([zip-debug-info],
578 if test "x${enable_zip_debug_info}" = "xno"; then 574 [AS_HELP_STRING([--disable-zip-debug-info],[disable zipping of debug-info files @<:@enabled@:>@])],
579 ZIP_DEBUGINFO_FILES=false 575 [enable_zip_debug_info="${enableval}"], [enable_zip_debug_info="yes"])
580 else 576 AC_MSG_RESULT([${enable_zip_debug_info}])
581 ZIP_DEBUGINFO_FILES=true 577
582 fi 578 if test "x${enable_zip_debug_info}" = "xno"; then
583 579 ZIP_DEBUGINFO_FILES=false
584 AC_SUBST(ENABLE_DEBUG_SYMBOLS) 580 else
585 AC_SUBST(ZIP_DEBUGINFO_FILES) 581 ZIP_DEBUGINFO_FILES=true
586 AC_SUBST(CFLAGS_DEBUG_SYMBOLS) 582 fi
587 AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS) 583
584 AC_SUBST(ENABLE_DEBUG_SYMBOLS)
585 AC_SUBST(ZIP_DEBUGINFO_FILES)
586 AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
587 AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
588 ]) 588 ])
589 589
590 # Support for customization of the build process. Some build files 590 # Support for customization of the build process. Some build files
591 # will include counterparts from this location, if they exist. This allows 591 # will include counterparts from this location, if they exist. This allows
592 # for a degree of customization of the build targets and the rules/recipes 592 # for a degree of customization of the build targets and the rules/recipes
593 # to create them 593 # to create them
594 AC_ARG_WITH([custom-make-dir], [AS_HELP_STRING([--with-custom-make-dir], 594 AC_ARG_WITH([custom-make-dir], [AS_HELP_STRING([--with-custom-make-dir],
595 [use this directory for custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir]) 595 [use this directory for custom build/make files])], [CUSTOM_MAKE_DIR=$with_custom_make_dir])
596 AC_SUBST(CUSTOM_MAKE_DIR) 596 AC_SUBST(CUSTOM_MAKE_DIR)

Mercurial Repository: jdk8-mips64-public

mercurial