diff options
| author | jan Iversen <jani@libreoffice.org> | 2018-01-05 13:21:15 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2018-01-05 13:22:26 +0100 |
| commit | ed746579fec3da102c8b646cb24548cd3c084ca9 (patch) | |
| tree | cd7427427ce7316cc508e92bd978334af897f41b | |
| parent | 57f94390c3d4e3faf2a5d80d22954edb9042761c (diff) | |
iOS, cherry-picked wrong version.
Reverting CustomTarget_iOS_prelink.mk to static lib version
Change-Id: I44d7441ce4284ed0551637a3827e93c2df369af9
| -rw-r--r-- | ios/CustomTarget_iOS_prelink.mk | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/ios/CustomTarget_iOS_prelink.mk b/ios/CustomTarget_iOS_prelink.mk index ba8cc9dacb06..718a797f5a34 100644 --- a/ios/CustomTarget_iOS_prelink.mk +++ b/ios/CustomTarget_iOS_prelink.mk @@ -6,11 +6,12 @@ # 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 ------------------------------------------------------------------------ -IOSLD = /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld +IOSDEV = /Applications/Xcode.app/Contents/Developer/ +IOSLD = $(IOSDEV)Toolchains/XcodeDefault.xctoolchain/usr/bin/ld IOSOBJ = $(WORKDIR)/CObject/ios/Kit.o ifeq ($(ENABLE_DEBUG),TRUE) -IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.dylib +IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME)_debug.a else IOSKIT = $(SRCDIR)/ios/generated/libKit_$(CPUNAME).a endif @@ -29,24 +30,14 @@ $(call gb_CustomTarget_get_target,ios/iOS_prelink): $(IOSKIT) FORCE: $(IOSKIT): $(call gb_StaticLibrary_get_target,iOS_kitBridge) FORCE -#ifeq ($(ENABLE_DEBUG),TRUE) - $(IOSLD) -dylib -ios_version_min 11.2 \ + $(IOSLD) -r -ios_version_min 11.2 \ -syslibroot $(MACOSX_SDK_PATH) \ -arch `echo $(CPUNAME) | tr '[:upper:]' '[:lower:]'` \ - -o $(IOSKIT) \ + -o $(IOSOBJ) \ $(WORKDIR)/CObject/ios/source/LibreOfficeKit.o \ `$(SRCDIR)/bin/lo-all-static-libs` \ $(call gb_StaticLibrary_get_target,iOS_kitBridge) -#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 + $(AR) -r $(IOSKIT) $(IOSOBJ) |