Use embedded DWARF in the iOS apps except for in release build

Desktop / LibreOffice - Tor Lillqvist [collabora.com] - 19 December 2013 15:28 UTC

Running dsymutil takes much too long to be bearable during development. But when building for actual release we do want a separate dSYM of course. (Of course none of the current iOS apps in the source are intended to be actually "released". But add this logic just for completeness.)

###

diff --git a/configure.ac b/configure.ac
index 1734796..b0a3d6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3865,6 +3865,13 @@ else
fi
AC_SUBST(ENABLE_SYMBOLS)

+# Running dsymutil takes too long
+XCODE_DEBUG_INFORMATION_FORMAT=dwarf-with-dsym
+if test "$enable_release_build" != yes -a \( -n "$ENABLE_SYMBOLS" -o -n "$ENABLE_DEBUG" -o -n "$ENABLE_DBGUTIL" \); then
+ XCODE_DEBUG_INFORMATION_FORMAT=dwarf
+fi
+AC_SUBST(XCODE_DEBUG_INFORMATION_FORMAT)
+
# Check for explicit A/C/CXX/OBJC/OBJCXX/LDFLAGS.
# By default use the ones specified by our build system,
# but explicit override is possible.
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 0f7ad53..f236daf 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -370,7 +370,6 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
- DEBUG_INFORMATION_FORMAT = dwarf;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
index 3f654ed..60e228e 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -22,6 +22,7 @@ LO_WORKDIR = @WORKDIR@
// what they will be used for.
ARCHS = @XCODE_ARCHS@
CLANG_CXX_LIBRARY = @XCODE_CLANG_CXX_LIBRARY@
+DEBUG_INFORMATION_FORMAT=@XCODE_DEBUG_INFORMATION_FORMAT@

// These settings are edited in CustomTarget_Lo_Xcconfig.mk.
LINK_LDFLAGS =

969bd8a Use embedded DWARF in the iOS apps except for in release build
configure.ac | 7 +++++++
.../TiledLibreOffice.xcodeproj/project.pbxproj | 1 -
ios/lo.xcconfig.in | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)

Upstream: cgit.freedesktop.org

  • Share