summaryrefslogtreecommitdiff
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-02 10:42:43 +0200
commit1c2d3a8ddca1455525508601e9a024a180b1be64 (patch)
tree16a10aae9b51b7988208e3a99490d303361199e1
parent7b2c8378cfa48f1dad2bd86136e33095bb13b664 (diff)
downloadqt4-tools-1c2d3a8ddca1455525508601e9a024a180b1be64.tar.gz
QNX: change suffix for separate debug files
QNX uses .sym for files containing debug symbols. Patch-by: Greg Bentz (cherry picked from commit 291e1a9e67499f6fa8285a1d4ed1ea6e8297dd5f) Change-Id: I03202da79de0f606c7c99a2db986d2343e51663d 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 d4f4b8196c..03ed6e70d7 100755
--- a/configure
+++ b/configure
@@ -4123,7 +4123,7 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "ye
cat << EOF
$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.
EOF
diff --git a/mkspecs/features/unix/separate_debug_info.prf b/mkspecs/features/unix/separate_debug_info.prf
index 8843c6d2a8..1827d11daa 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:!staticlib:!static:!contains(TEMPLATE, subdirs):!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"
}
}