[Libreoffice-commits] .: hyphen/makefile.mk

[Tor Lillqvist]

 hyphen/makefile.mk |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit dfff6a8b40edec6fa877cb17e5c252672d405a55
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat May 14 01:47:28 2011 +0300

    Cross-compilation support and iOS in particular

diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index 94c1592..529020f 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -51,7 +51,11 @@ CONFIGURE_DIR=$(BUILD_DIR)
 #relative to CONFIGURE_DIR
 # still needed also in system-hyphen case as it creates the makefile
 CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic
+CONFIGURE_FLAGS=--disable-shared
+
+.IF "$(OS)"!="IOS"
+CONFIGURE_FLAGS+= --with-pic
+.ENDIF
 
 .IF "$(COM)"=="C52" && "$(CPU)"=="U"
 LCL_CONFIGURE_CFLAGS+=-m64
@@ -82,7 +86,6 @@ OUT2INC += hyphen.h
 
 .ENDIF # "$(GUI)"=="UNX"
 
-
 .IF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
 CONFIGURE_ACTION=configure
@@ -101,6 +104,10 @@ BUILD_ACTION=dmake
 OUT2INC += hyphen.h
 .ENDIF # "$(GUI)"=="OS2"
 
+.IF "$(CROSS_COMPILING)"!=""
+CONFIGURE_FLAGS+= --build="$(BUILD_PLATFORM)" --host="$(HOST_PLATFORM)"
+.ENDIF
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE : set_ext.mk