diff options
| author | aavit <qt-info@nokia.com> | 2011-04-07 08:26:12 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2011-04-07 08:58:41 (GMT) |
| commit | 2ff409e9eb9c39bcc36c9b0adace2680183af160 (patch) | |
| tree | 4b2e743a5fbcc7eb95c4df4c6f8ccbf2463b14e3 | |
| parent | 892897a2d81f9a38944054329a0236748264efc9 (diff) | |
| download | Qt-2ff409e9eb9c39bcc36c9b0adace2680183af160.zip Qt-2ff409e9eb9c39bcc36c9b0adace2680183af160.tar.gz Qt-2ff409e9eb9c39bcc36c9b0adace2680183af160.tar.bz2 | |
Fixes: The "test: too many arguments" error after every make
If the gdb version string was not matched, it would be passed in full
to test. This new regexp matches the different kinds of gdb
version string observed in the wild, as listed in
qtcreator/tests/auto/debugger/tst_version.cpp
Reviewed-by: aep <arvid.picciani@nokia.com>
| -rw-r--r-- | mkspecs/features/unix/gdb_dwarf_index.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf index 14c4c38..14db4fc 100644 --- a/mkspecs/features/unix/gdb_dwarf_index.prf +++ b/mkspecs/features/unix/gdb_dwarf_index.prf @@ -1,7 +1,7 @@ !CONFIG(separate_debug_info):CONFIG(debug, debug|release):!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) { QMAKE_GDB_INDEX = { test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\"; } && \ - test \$\$(gdb --version | sed -e \'s,[^(]*(GDB)[^)]\\([0-9]\\)\\.\\([0-9]\\).*,\\1\\2,;q\') -gt 72 && \ + 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)\' && \ test -f $(TARGET).gdb-index && \ $$QMAKE_OBJCOPY --add-section \'.gdb_index=$(TARGET).gdb-index\' --set-section-flags \'.gdb_index=readonly\' \'$(TARGET)\' \'$(TARGET)\' && \ |