Mercurial > hg > icedtea8-forest
changeset 2014:3e39851fea09 icedtea-3.5.0pre01
PR3384: aarch32: aarch32 should default to client variant as server fails to build
| author | andrew |
|---|---|
| date | Tue, 16 May 2017 18:15:13 +0100 |
| parents | 7c357084c459 |
| children | d3f000187192 |
| files | common/autoconf/generated-configure.sh common/autoconf/jdk-options.m4 |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Tue May 16 18:13:50 2017 +0100 +++ b/common/autoconf/generated-configure.sh Tue May 16 18:15:13 2017 +0100 @@ -3999,7 +3999,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1494954810 +DATE_WHEN_GENERATED=1494954918 ############################################################################### # @@ -8060,7 +8060,11 @@ if test "x$with_jvm_variants" = x; then - with_jvm_variants="server" + if test "x$OPENJDK_TARGET_CPU" = xaarch32; then + with_jvm_variants="client"; + else + with_jvm_variants="server"; + fi fi JVM_VARIANTS=",$with_jvm_variants,"
--- a/common/autoconf/jdk-options.m4 Tue May 16 18:13:50 2017 +0100 +++ b/common/autoconf/jdk-options.m4 Tue May 16 18:15:13 2017 +0100 @@ -98,7 +98,11 @@ [JVM variants (separated by commas) to build (server, client, minimal1, kernel, zero, zeroshark, core) @<:@server@:>@])]) if test "x$with_jvm_variants" = x; then - with_jvm_variants="server" + if test "x$OPENJDK_TARGET_CPU" = xaarch32; then + with_jvm_variants="client"; + else + with_jvm_variants="server"; + fi fi JVM_VARIANTS=",$with_jvm_variants,"