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