[Libreoffice-commits] .: hunspell/makefile.mk mythes/makefile.mk

[Tor Lillqvist]

 hunspell/makefile.mk |    2 +-
 mythes/makefile.mk   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f5cea39979f395b586ae1a52c8adfe4ff0176466
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Sat Feb 18 01:14:42 2012 +0200

    Use STDLIBCUIMT so that the sample executables link for Android
    
    Without using STDLIBCUIMT and the -lgnustl_shared it contains the
    sample executables in hunspell and mythes won't link. Sure, they won't
    be used for anything, but it's easier this way than to patch out
    building them.

diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index 8cf2e4e..a1c035a 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -69,7 +69,7 @@ CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
 .ENDIF
 
 .IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) LIBS="$(STDLIBCUIMT)"
 .ENDIF
 
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index f10d0a0..46520fc 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -81,7 +81,7 @@ CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
 .ENDIF
 
 .IF "$(CROSS_COMPILING)"=="YES"
-CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no LIBS="$(STDLIBCUIMT)"
 .ENDIF
 
 BUILD_ACTION=make