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

[jan Iversen]

 ios/CustomTarget_iOS_prelink.mk |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

New commits:
commit 5c23224ca60abdf8d0e99010ea1066474b57d396
Author: jan Iversen <j...@libreoffice.org>
Date:   Fri Jan 5 08:55:11 2018 +0100

    iOS, removed unused declaration
    
    Change-Id: I8867048756a0484d1b75515335f3a2002f128e6d

diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk
index 718a797f5a34..ba8cc9dacb06 100644
--- a/ios/CustomTarget_iOS_prelink.mk
+++ b/ios/CustomTarget_iOS_prelink.mk
@@ -6,12 +6,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #- Env ------------------------------------------------------------------------
-IOSDEV = /Applications/Xcode.app/Contents/Developer/
-IOSLD = $(IOSDEV)Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
+IOSLD = 
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld
 IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o
 
 ifeq ($(ENABLE_DEBUG),TRUE)
-IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.a
+IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.dylib
 else
 IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME).a
 endif
@@ -30,14 +29,24 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): 
$(IOSKIT)
 FORCE:
 
 $(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge) FORCE
-       $(IOSLD) -r -ios_version_min 11.2 \
+#ifeq ($(ENABLE_DEBUG),TRUE)
+       $(IOSLD) -dylib -ios_version_min 11.2 \
            -syslibroot $(MACOSX_SDK_PATH) \
            -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
-           -o $(IOSOBJ) \
+           -o $(IOSKIT) \
            $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
            `$(SRCDIR)/bin/lo-all-static-libs` \
            $(call gb_StaticLibrary_get_target,iOS_kitBridge)
-       $(AR) -r $(IOSKIT) $(IOSOBJ)
+#else
+#      $(IOSLD) -r -ios_version_min 11.2 \
+#          -syslibroot $(MACOSX_SDK_PATH) \
+#          -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'` \
+#          -o $(IOSOBJ) \
+#          $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \
+#          `$(SRCDIR)/bin/lo-all-static-libs` \
+#          $(call gb_StaticLibrary_get_target,iOS_kitBridge)
+#      $(AR) -r $(IOSKIT) $(IOSOBJ)
+#endif
 
 
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits