diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-05-27 20:52:17 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-05-27 20:52:53 +0200 |
| commit | 3935ff3b33404bb859335b2bdbea42e583546bcd (patch) | |
| tree | eb9bcf4e976302c6a2c2c96735960b6bdfce6615 /configure.ac | |
| parent | 747bcdc14386978f2a98a452e52c8dcc2459d319 (diff) | |
configure: don't check JVM bit-ness when cross compiling
Change-Id: Icf3a58257c8c8e90d7e9d38f167a9b9f80d4bf32
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 4130928b5abf..c5508a0bece9 100644 --- a/configure.ac +++ b/configure.ac @@ -6836,7 +6836,9 @@ if test "$ENABLE_JAVA" != ""; then else AC_MSG_RESULT([no]) fi - else # ? not sure if it's valid for all OS, and all JVMs? + elif test "$cross_compiling" != "yes"; then + # at least 2 reasons to check: officebean needs to link -ljawt, + # and libjpipe.so needs to be loaded by java to run JunitTests. case $CPUNAME in AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64) if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then |