diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-10-03 22:06:34 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-10-03 22:15:28 +0200 |
| commit | eb957c16904717201536f289063de63f1653dbf9 (patch) | |
| tree | 5d2c00f36bb7786f29da68e86d08423b40b36bb0 /ios | |
| parent | 9bc39be417a4c436cbe18391fc87e5e835551b07 (diff) | |
iOS, get rid of OSX - iOS link conflict.
Prelinking uses special flags, adjusted.
Change-Id: Ie9537df3a158818128ee0c4e08b3ad0a782009fb
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/CustomTarget_iOS.mk | 2 | ||||
| -rw-r--r-- | ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 22 | ||||
| -rw-r--r-- | ios/loApp.xcconfig.in | 1 | ||||
| -rw-r--r-- | ios/loKit.xcconfig.in | 1 |
4 files changed, 12 insertions, 14 deletions
diff --git a/ios/CustomTarget_iOS.mk b/ios/CustomTarget_iOS.mk index a05194b7d318..d765ca2426f6 100644 --- a/ios/CustomTarget_iOS.mk +++ b/ios/CustomTarget_iOS.mk @@ -36,7 +36,6 @@ $(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i -e "s'@WORKDIR@'$(WORKDIR)'g" \ -e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \ -e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \ - -e "s'@LDFLAGS@'-Wl,-lz,-liconv,-map,$(WORKDIR)/ios/iosKit.map 'g" \ -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \ -e "s'@PRELINK@'`$(SRCDIR)/bin/lo-all-static-libs`'g" \ $(SRCDIR)/ios/loKit.xcconfig.in > $(WORKDIR)/ios/loKit.xcconfig @@ -46,7 +45,6 @@ $(IOSKITXC) $(IOSAPPXC): $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i -e "s'@WORKDIR@'$(WORKDIR)'g" \ -e "s'@CFLAGS@'$(gb_GLOBALDEFS)'g" \ -e "s'@CPLUSPLUSFLAGS@'$(gb_GLOBALDEFS)'g" \ - -e "s'@LDFLAGS@'-Wl,-lz,-liconv,-map,$(WORKDIR)/ios/iosKit.map 'g" \ -e "s'@SYMROOT@'$(WORKDIR)/ios/build'g" \ $(SRCDIR)/ios/loApp.xcconfig.in > $(WORKDIR)/ios/loApp.xcconfig diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj index 918920baeee5..407b57cb37d5 100644 --- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj +++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj @@ -198,12 +198,11 @@ "$(LO_SRCDIR)/ios/generated", ); IPHONEOS_DEPLOYMENT_TARGET = 10.3; + LD_GENERATE_MAP_FILE = YES; + LD_MAP_FILE_PATH = ./iosKit.map; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ( - "$(LINK_LDFLAGS)", - "-lstdc++", - ); + PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz -liconv"; SDKROOT = iphoneos; VALID_ARCHS = "x86_64 arm64"; }; @@ -261,12 +260,11 @@ "$(LO_SRCDIR)/ios/generated", ); IPHONEOS_DEPLOYMENT_TARGET = 10.3; + LD_GENERATE_MAP_FILE = YES; + LD_MAP_FILE_PATH = ./iosKit.map; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ( - "$(LINK_LDFLAGS)", - "-lstdc++", - ); + PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz -liconv"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; VALID_ARCHS = "x86_64 arm64"; @@ -276,7 +274,9 @@ 39B5D21F1F78130F008FB162 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - OTHER_LDFLAGS = "-ObjC"; + OTHER_LDFLAGS = ""; + PRELINK_FLAGS = "-ios_version_min 9.3"; + PRELINK_LIBS = ""; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; @@ -285,7 +285,9 @@ 39B5D2201F78130F008FB162 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - OTHER_LDFLAGS = "-ObjC"; + OTHER_LDFLAGS = ""; + PRELINK_FLAGS = "-ios_version_min 9.3"; + PRELINK_LIBS = ""; PRODUCT_NAME = "$(TARGET_NAME)"; SKIP_INSTALL = YES; }; diff --git a/ios/loApp.xcconfig.in b/ios/loApp.xcconfig.in index c7fae301374c..dba31a09691d 100644 --- a/ios/loApp.xcconfig.in +++ b/ios/loApp.xcconfig.in @@ -12,6 +12,5 @@ LO_SRCDIR = @SRCDIR@ LO_WORKDIR = @WORKDIR@ OTHER_CFLAGS = @CFLAGS@ OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@ -LINK_LDFLAGS = @LDFLAGS@ SYMROOT = @SYMROOT@ diff --git a/ios/loKit.xcconfig.in b/ios/loKit.xcconfig.in index 8b1e62f230db..1a00e5747257 100644 --- a/ios/loKit.xcconfig.in +++ b/ios/loKit.xcconfig.in @@ -12,7 +12,6 @@ LO_SRCDIR = @SRCDIR@ LO_WORKDIR = @WORKDIR@ OTHER_CFLAGS = @CFLAGS@ OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@ -LINK_LDFLAGS = @LDFLAGS@ SYMROOT = @SYMROOT@ PRELINK_LIBS = @PRELINK@ |