[Libreoffice-commits] .: configure.ac

Wed Jan 2 13:59:29 PST 2013

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

New commits:
commit 2ed074578b00582e40cf6380f629570d1eee3f71
Author: Tor Lillqvist <tml at iki.fi>
Date:   Wed Jan 2 23:58:51 2013 +0200

    Unbreak build with just the NDK without a 64-bit add-on tool-chain
    
    Change-Id: I05c558b557cf083feb570f8ac14ecb75c1c21eb6

diff --git a/configure.ac b/configure.ac
index d5ed79d..c60ae01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,7 +159,7 @@ if test -n "$with_android_ndk"; then
     if test $build_os = linux-gnu; then
         case $build_cpu in
         x86_64)
-            case "`echo $ANDROID_NDK_HOME/toolchains/$android_cpu*-*$with_android_ndk_toolchain_version/prebuilt/linux-x86_64/bin`" in
+            case "`ls -d $ANDROID_NDK_HOME/toolchains/$android_cpu*-*$with_android_ndk_toolchain_version/prebuilt/linux-x86_64/bin 2>/dev/null`" in
             */bin|*/bin\ */bin*)
                 toolchain_system=linux-x86_64
                 ;;
