summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjan Iversen <jani@libreoffice.org>2017-11-22 08:32:33 +0100
committerjan Iversen <jani@libreoffice.org>2017-11-22 11:48:33 +0100
commit1b36048a42f8f18667ff45bed9e8c248e7edcc75 (patch)
tree461d428ab2068c58bb06252a5404aa3b14ae6a05
parent67304b83a7933a75ed24dd41a311d0250f15a203 (diff)
iOS, changed debugger from to lldb
gdb2 does not work well when using a swift based frontend. changing to default debugger but only for iOS. Change-Id: Iae0df85b9db4b3dfaf9fbc0e42848c52f3685a48
-rw-r--r--ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj4
-rw-r--r--ios/loApp.xcconfig.in4
-rw-r--r--solenv/gbuild/platform/iOS.mk3
3 files changed, 7 insertions, 4 deletions
diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
index 70821840f233..abd1fe3ec65b 100644
--- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
+++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj
@@ -205,7 +205,7 @@
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
- PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv -ggdb2";
+ PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv -g";
SDKROOT = iphoneos;
VALID_ARCHS = "x86_64 arm64";
};
@@ -272,7 +272,7 @@
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
- PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv -ggdb2";
+ PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv -g";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "x86_64 arm64";
diff --git a/ios/loApp.xcconfig.in b/ios/loApp.xcconfig.in
index 060598e49041..0c0fc98dac79 100644
--- a/ios/loApp.xcconfig.in
+++ b/ios/loApp.xcconfig.in
@@ -15,13 +15,13 @@ OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@
SYMROOT = @SYMROOT@
//:configuration = Debug
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a -ggdb2
+LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a -g
//:configuration = Release
LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64.a
//:configuration = Simulator
-LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a -ggdb2
+LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a -g
//:completeSettings = some
diff --git a/solenv/gbuild/platform/iOS.mk b/solenv/gbuild/platform/iOS.mk
index 6f71fda69b4d..46127c9595bf 100644
--- a/solenv/gbuild/platform/iOS.mk
+++ b/solenv/gbuild/platform/iOS.mk
@@ -28,6 +28,9 @@ gb_COMPILEROPTFLAGS := -Oz
include $(GBUILDDIR)/platform/com_GCC_defs.mk
+# Use standard lldb debugger
+gb_DEBUGINFO_FLAGS=-g
+
# Darwin mktemp -t expects a prefix, not a pattern
gb_MKTEMP := /usr/bin/mktemp -t gbuild.