summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2016-09-27 22:06:04 +0200
committerMichael Stahl <mstahl@redhat.com>2016-09-28 11:26:47 +0000
commitd8e46307cd8190c93c0b60e394475536b40e3a46 (patch)
treeea6ecb92960adce8031e3a1e0212d5d208cf7517 /configure.ac
parent0ed3075009cf48844759b2cfa5938d66675b46c6 (diff)
fix build on 32-bit ARM on latest Rawhide
Change-Id: If00c42235d6ec92634dc8c23fdcbb50e332ffa68 (cherry picked from commit 99d2240ab618b4877af99234e8897315c00ad01b) Reviewed-on: https://gerrit.libreoffice.org/29343 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 8366bef50ffd..d271db2e62d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7180,7 +7180,8 @@ then
else
case "$host_cpu" in
arm*)
- my_java_arch=arm
+ AS_IF([test -e "$JAVA_HOME/jre/lib/aarch32/libjawt.so"], [my_java_arch=aarch32], [my_java_arch=arm])
+ JAVA_ARCH=$my_java_arch
;;
i*86)
my_java_arch=i386