summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Hartmann <phartmann@rim.com>2012-09-25 15:30:44 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-01 10:34:24 +0200
commit291e1a9e67499f6fa8285a1d4ed1ea6e8297dd5f (patch)
treea31c87f99b37226fac5553d149473dba3ae9a066
parent80f6d7862c0e2e41768620d5bd81b0e1d5e3f61f (diff)
QNX: change suffix for separate debug files
QNX uses .sym for files containing debug symbols. Change-Id: Ieb995ae90af771ff5c877213f4f4982169f333c6 Patch-by: Greg Bentz Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rwxr-xr-xconfigure2
-rw-r--r--mkspecs/features/unix/separate_debug_info.prf16
2 files changed, 10 insertions, 8 deletions
diff --git a/configure b/configure
index 19eef3f4bb..576eeacd16 100755
--- a/configure
+++ b/configure
@@ -3247,7 +3247,7 @@ Additional options:
(experimental)
$SBN -no-separate-debug-info . Do not store debug information in a separate file.
- $SBY -separate-debug-info .... Strip debug information into a separate .debug file.
+ $SBY -separate-debug-info .... Strip debug information into a separate file.
$XCBN -no-xcb ............ Do not compile Xcb (X protocol C-language Binding) support.
$XCBY -xcb ............... Compile Xcb support.
diff --git a/mkspecs/features/unix/separate_debug_info.prf b/mkspecs/features/unix/separate_debug_info.prf
index 2e36dd25f5..0e0f60e16e 100644
--- a/mkspecs/features/unix/separate_debug_info.prf
+++ b/mkspecs/features/unix/separate_debug_info.prf
@@ -1,18 +1,20 @@
!separate_debug_info_nocopy:have_target:!staticlib:!static:!isEmpty(QMAKE_OBJCOPY) {
- QMAKE_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; $$QMAKE_OBJCOPY --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && $$QMAKE_OBJCOPY --strip-debug \"\$\$targ\" && $$QMAKE_OBJCOPY --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\"
- QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/
+ qnx:debug_info_suffix=sym
+ else:debug_info_suffix=debug
+ QMAKE_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; $$QMAKE_OBJCOPY --only-keep-debug \"\$\$targ\" \"\$\$targ.$$debug_info_suffix\" && $$QMAKE_OBJCOPY --strip-debug \"\$\$targ\" && $$QMAKE_OBJCOPY --add-gnu-debuglink=\"\$\$targ.$$debug_info_suffix\" \"\$\$targ\" && chmod -x \"\$\$targ.$$debug_info_suffix\"
+ QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.$$debug_info_suffix $(INSTALL_ROOT)/\$\$target_path/
!isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$escape_expand(\\n\\t)$$QMAKE_POST_LINK
QMAKE_POST_LINK = $$QMAKE_SEPARATE_DEBUG_INFO $$QMAKE_POST_LINK
- silent:QMAKE_POST_LINK = @echo creating $@.debug && $$QMAKE_POST_LINK
+ silent:QMAKE_POST_LINK = @echo creating $@.$$debug_info_suffix && $$QMAKE_POST_LINK
isEmpty(DESTDIR) {
- target.targets += "`basename $(TARGET)`.debug"
- QMAKE_DISTCLEAN += "`basename $(TARGET)`.debug"
+ target.targets += "`basename $(TARGET)`.$$debug_info_suffix"
+ QMAKE_DISTCLEAN += "`basename $(TARGET)`.$$debug_info_suffix"
} else {
- target.targets += "$(DESTDIR)/`basename $(TARGET)`.debug"
- QMAKE_DISTCLEAN += "$(DESTDIR)/`basename $(TARGET)`.debug"
+ target.targets += "$(DESTDIR)/`basename $(TARGET)`.$$debug_info_suffix"
+ QMAKE_DISTCLEAN += "$(DESTDIR)/`basename $(TARGET)`.$$debug_info_suffix"
}
}