mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: don't check JVM bit-ness when cross compiling

Browse Source 
Change-Id: Icf3a58257c8c8e90d7e9d38f167a9b9f80d4bf32
This commit is contained in:
Michael Stahl
2014-05-27 20:52:17 +02:00
parent 747bcdc143
commit 3935ff3b33
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -6836,7 +6836,9 @@ if test "$ENABLE_JAVA" != ""; then
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi 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 case $CPUNAME in
AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64) AXP|X86_64|HPPA|IA64|POWERPC64|S390X|SPARC64)
if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then if test -f "$JAVAINTERPRETER" -a "`$JAVAINTERPRETER -version 2>&1 | $GREP -i 64-bit`" = "" >/dev/null; then