[Libreoffice-commits] .: 2 commits - icc/makefile.mk mythes/makefile.mk

[Tor Lillqvist]

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

New commits:
commit 7999a0c4e14c2c30e9f6758a347cc45721769179
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 7 00:44:50 2011 +0300

    Do nothing when cross-compiling in general, not just for iOS

diff --git a/icc/makefile.mk b/icc/makefile.mk
index 14a803e..f9e0622 100644
--- a/icc/makefile.mk
+++ b/icc/makefile.mk
@@ -34,7 +34,10 @@ TARGET=icc
 
 .INCLUDE :	settings.mk
 
-.IF "$(OS)"!="IOS"
+.IF "$(CROSS_COMPILING)"=="YES"
+all:
+    @echo Nothing done when cross-compiling
+.ENDIF
 
 # --- Files --------------------------------------------------------
 
@@ -58,8 +61,5 @@ BUILD_ACTION=dmake &&  cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIB
 
 .INCLUDE :	set_ext.mk
 
-.ENDIF
 .INCLUDE :	target.mk
-.IF "$(OS)"!="IOS"
 .INCLUDE :	tg_ext.mk
-.ENDIF
commit 1fc9f649427dbdb0cd58b0a8ac8ccc99388e8fe8
Author: Tor Lillqvist <tml at iki.fi>
Date:   Tue Jun 7 00:05:01 2011 +0300

    Add cross-compilation support

diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index 20efead..563c756 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -80,6 +80,10 @@ CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
 CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
 .ENDIF
 
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no
+.ENDIF
+
 BUILD_ACTION=make
 OUT2INC += mythes.hxx
 .ENDIF