[Libreoffice-commits] core.git: configure.ac

[David Tardon]

 configure.ac |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 99d2240ab618b4877af99234e8897315c00ad01b
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Sep 27 22:06:04 2016 +0200

    fix build on 32-bit ARM on latest Rawhide
    
    Change-Id: If00c42235d6ec92634dc8c23fdcbb50e332ffa68

diff --git a/configure.ac b/configure.ac
index e02559d..f5a51cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7141,7 +7141,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