[Libreoffice-commits] core.git: Repository.mk

Tor Lillqvist tml at iki.fi
Mon Jun 17 01:18:26 PDT 2013


 Repository.mk |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit a074ee056a8b73fc14724522a5c0d1c34850c529
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jun 17 11:15:44 2013 +0300

    Fix iOS cross-compilation
    
    No idea why the filter-out here was needed at some point in time, but
    at least now it broke cross-compilation for iOS.
    
    Change-Id: I6c4d3f6151ac2821db5f79c3e4113400b740f7f3

diff --git a/Repository.mk b/Repository.mk
index 3473046..51089bb 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -119,10 +119,8 @@ $(eval $(call gb_Helper_register_executables,OOO, \
 
 $(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
 	$(if $(and $(SOLAR_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
-	$(if $(filter-out IOS,$(OS)), \
-		regmerge \
-		regview \
-	) \
+	regmerge \
+	regview \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),uno) \
 ))
 


More information about the Libreoffice-commits mailing list