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

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e632cee783513891dccdf64b8f60398a8940c0fb
Author: jan Iversen <jani at libreoffice.org>
Date:   Fri Nov 24 19:18:23 2017 +0100

    iOS, typo in release mk
    
    removed extra l
    
    Change-Id: I6b01bb25a3e8d1caa5ba04ac09a5fa078bb2d664

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index 8c97019b8c41..76ece5a5023b 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -12,7 +12,7 @@ IOSLD = $(IOSDEV)Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
 ifeq ($(ENABLE_DEBUG),TRUE)
 IOSKIT = $(SRCDIR)/ios/generated/libLibreOfficeKit_$(CPUNAME)_debug.o
 else
-IOSKIT = l$(SRCDIR)/ios/generated/libLibreOfficeKit_$(CPUNAME).o
+IOSKIT = $(SRCDIR)/ios/generated/libLibreOfficeKit_$(CPUNAME).o
 endif
 
 
commit d29439104f060fa3b5eb17260a2fda69d8943d16
Author: jan Iversen <jani at libreoffice.org>
Date:   Fri Nov 24 19:13:25 2017 +0100

    iOS, used wrong gbuild get_target macro
    
    Change-Id: Ie23c71faef2b14480b3797dd66bfe9788401ccf4

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index b48b43e5e0c3..8c97019b8c41 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -28,7 +28,7 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): $(IOSKIT)
 .PHONY: FORCE
 FORCE:
 
-$(IOSKIT): $(call gb_CustomTarget_get_target,iOS_kitBridge) FORCE
+$(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge) FORCE
 	$(IOSLD) -r -ios_version_min 11.1 \
 	    -syslibroot $(MACOSX_SDK_PATH) \
 	    -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \