From eed96773b4adf7fdec74502ee89bca63b9018a80 Mon Sep 17 00:00:00 2001
From: jan Iversen <jani@libreoffice.org>
Date: Fri, 6 Oct 2017 09:20:22 +0200
Subject: iOS, fixes for release build

removed coinmp (needed to update lo-all-static-libs)
convert CPUNAME to lowercase (needed by xcodebuild)

Change-Id: I13ccfbd6a6fd139db2745c1536192710afe094bb
---
 ios/CustomTarget_iOS.mk                                     | 2 +-
 ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'ios')

diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk
index 55375687ff0e..f3e834f5084f 100644
--- a/ios/CustomTarget_iOS.mk
+++ b/ios/CustomTarget_iOS.mk
@@ -116,7 +116,7 @@ $(IOSGEN)/$(IOSKIT): $(IOSKITPRJ)/project.pbxproj $(IOSKITXC) $(IOSAPPXC)
 	        -project $(IOSKITPRJ) \
 	        -target LibreOfficeKit \
 	        -sdk $(IOS_SDK) \
-	        -arch $(CPU_NAME) \
+	        -arch `echo $(CPUNAME) |  tr '[:upper:]' '[:lower:]'`\
 	        -configuration $(if $(ENABLE_DEBUG),Debug,Release) \
 	        build \
 	        , $(WORKDIR)/ios/build.log \
diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
index 407b57cb37d5..ca9a90549414 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -25,7 +25,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		3908315E1F8395EB003F2A29 /* loKit.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = loKit.xcconfig; path = ../../../../../../../Users/jani/lo_ios/workdir/ios/loKit.xcconfig; sourceTree = "<group>"; };
 		39B5D2151F78130F008FB162 /* libLibreOfficeKit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libLibreOfficeKit.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		39B5D2181F78130F008FB162 /* LibreOfficeKit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LibreOfficeKit.h; sourceTree = "<group>"; };
 		39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = LibreOfficeKit.mm; sourceTree = "<group>"; };
@@ -69,7 +68,6 @@
 		39B5D2171F78130F008FB162 /* LibreOfficeKit */ = {
 			isa = PBXGroup;
 			children = (
-				3908315E1F8395EB003F2A29 /* loKit.xcconfig */,
 				39B5D2181F78130F008FB162 /* LibreOfficeKit.h */,
 				39B5D2191F78130F008FB162 /* LibreOfficeKit.mm */,
 			);
-- 
cgit