[Libreoffice-commits] core.git: ios/CustomTarget_iOS_link.mk

jan Iversen jani at libreoffice.org
Fri Mar 2 17:31:21 UTC 2018


 ios/CustomTarget_iOS_link.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b8431e03bdedfbd2126f78e0464921b0583f7f9a
Author: jan Iversen <jani at libreoffice.org>
Date:   Fri Mar 2 18:28:13 2018 +0100

    iOS, allow "make" call in ios directory
    
    config_host.mk is not read before Custom_target_ios_link, which gives
    problems with the global variables
    
    Change-Id: I9738b5123f4e7aa848de17b00b39b8a03b3a477c

diff --git a/ios/CustomTarget_iOS_link.mk b/ios/CustomTarget_iOS_link.mk
index fc926a535d9d..9d868ca181cd 100644
--- a/ios/CustomTarget_iOS_link.mk
+++ b/ios/CustomTarget_iOS_link.mk
@@ -67,7 +67,7 @@ $(IOSKIT): $(IOSOBJ) $(IOSLIBS)
 	    -single_module \
 	    -compatibility_version 1 \
 	    -current_version 1 \
-	    $(IOSLIBS) \
+	    `$(SRCDIR)/bin/lo-all-static-libs` \
 	    $(IOSOBJ) \
 	    -o $(IOSKIT)
 ifeq ($(origin IOS_CODEID),undefined)


More information about the Libreoffice-commits mailing list