diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-12-19 23:22:04 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-12-19 23:28:33 +0200 |
| commit | 969bd8aa731935566a65c5e207ece6eb523df24e (patch) | |
| tree | f5b616385ad3a4f864a4beaadf70c92543118290 | |
| parent | 9b711d6da2f04dd7f0bd838854768bd36d353ca1 (diff) | |
Use embedded DWARF in the iOS apps except for in release build
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.)
Change-Id: Ibb5037d6926e969a891269d6c9d86232bc01cb3c
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 1 | ||||
| -rw-r--r-- | ios/lo.xcconfig.in | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 1734796ed26f..b0a3d6a89da3 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 0f7ad53a4c98..f236daf9be7a 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 3f654ed76041..60e228e0c23b 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 = |