diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-11 01:47:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-11 01:47:00 (GMT) |
| commit | cae83d7feacb874923ce86726318e43a1284aa63 (patch) | |
| tree | 3400eb0fbd1fb493c763d46adbfccc39580b0eef | |
| parent | 1ef5affa7aa12f9f70bcdd6d984b8e1b9ccd646b (diff) | |
| parent | 122fa6b53c33364a4687919191e55899acb43797 (diff) | |
| download | Qt-cae83d7feacb874923ce86726318e43a1284aa63.zip Qt-cae83d7feacb874923ce86726318e43a1284aa63.tar.gz Qt-cae83d7feacb874923ce86726318e43a1284aa63.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
fix gdb_dwarf_index.prf for applications, take two
fix gdb_dwarf_index.prf for executables
| -rw-r--r-- | mkspecs/features/unix/gdb_dwarf_index.prf | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf index 14db4fc..e3f79cd 100644 --- a/mkspecs/features/unix/gdb_dwarf_index.prf +++ b/mkspecs/features/unix/gdb_dwarf_index.prf @@ -1,8 +1,16 @@ !CONFIG(separate_debug_info):CONFIG(debug, debug|release):!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) { - QMAKE_GDB_INDEX = { test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\"; } && \ + contains(TEMPLATE, "lib") { + QMAKE_GDB_INDEX = { test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\"; } && + QMAKE_GDB_DIR = . + } else { + QMAKE_GDB_INDEX = { test -n \"$(DESTDIR)\" && DESTDIR=\"$(DESTDIR)\" || DESTDIR=.; } && + QMAKE_GDB_DIR = \$\$DESTDIR + } + + QMAKE_GDB_INDEX += \ test \$\$(gdb --version | sed -e \'s,[^0-9]\\+\\([0-9]\\)\\.\\([0-9]\\).*,\\1\\2,;q\') -gt 72 && \ - gdb --nx --batch --quiet -ex \'set confirm off\' -ex \'save gdb-index .\' -ex quit \'$(TARGET)\' && \ + gdb --nx --batch --quiet -ex \'set confirm off\' -ex \"save gdb-index $$QMAKE_GDB_DIR\" -ex quit \'$(TARGET)\' && \ test -f $(TARGET).gdb-index && \ $$QMAKE_OBJCOPY --add-section \'.gdb_index=$(TARGET).gdb-index\' --set-section-flags \'.gdb_index=readonly\' \'$(TARGET)\' \'$(TARGET)\' && \ $$QMAKE_DEL_FILE $(TARGET).gdb-index || true |