diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-07-30 00:05:53 +0200 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2011-07-30 00:05:53 +0200 |
| commit | 32ac6af49fbcb53746b88b097780b4f401b88ff8 (patch) | |
| tree | 3fcd5ad250fb467cf243748abe87b22eee949b99 | |
| parent | 6c7f5488ee9e7c89acc50827b4f9813624e241e0 (diff) | |
| download | crosstool-ng-32ac6af49fbcb53746b88b097780b4f401b88ff8.tar.gz crosstool-ng-32ac6af49fbcb53746b88b097780b4f401b88ff8.tar.bz2 crosstool-ng-32ac6af49fbcb53746b88b097780b4f401b88ff8.zip | |
debug/gdb: don;t install sample gdbinit for old versions
Only starting with gdb-7 does installing the gdbinit sample makes senses.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
| -rw-r--r-- | config/debug/gdb.in | 4 | ||||
| -rw-r--r-- | scripts/build/debug/300-gdb.sh | 30 |
2 files changed, 20 insertions, 14 deletions
diff --git a/config/debug/gdb.in b/config/debug/gdb.in index 478f76bb..119466ed 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -73,10 +73,14 @@ endchoice config GDB_7_0_or_later bool select GDB_HAS_PKGVERSION_BUGURL + select GDB_INSTALL_GDBINIT config GDB_HAS_PKGVERSION_BUGURL bool +config GDB_INSTALL_GDBINIT + bool + config GDB_VERSION string # Don't remove next line diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh index 66bd7b6b..0b25f2e8 100644 --- a/scripts/build/debug/300-gdb.sh +++ b/scripts/build/debug/300-gdb.sh @@ -150,20 +150,22 @@ do_debug_gdb_build() { CT_DoLog EXTRA "Installing cross-gdb" CT_DoExecLog ALL make install - CT_DoLog EXTRA "Install '.gdbinit' template" - # See in scripts/build/internals.sh for why we do this - if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ]; then - gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ) - else - gcc_version=$( sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \ - "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/version.c" \ - ) - fi - ${sed} -r \ - -e "s:@@PREFIX@@:${CT_PREFIX_DIR}:;" \ - -e "s:@@VERSION@@:${gcc_version}:;" \ - "${CT_LIB_DIR}/scripts/build/debug/gdbinit.in" \ - >"${CT_PREFIX_DIR}/share/gdb/gdbinit" + if [ "${CT_GDB_INSTALL_GDBINIT}" = "y" ]; then + CT_DoLog EXTRA "Install '.gdbinit' template" + # See in scripts/build/internals.sh for why we do this + if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ]; then + gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ) + else + gcc_version=$( sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \ + "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/version.c" \ + ) + fi + ${sed} -r \ + -e "s:@@PREFIX@@:${CT_PREFIX_DIR}:;" \ + -e "s:@@VERSION@@:${gcc_version}:;" \ + "${CT_LIB_DIR}/scripts/build/debug/gdbinit.in" \ + >"${CT_PREFIX_DIR}/share/gdb/gdbinit" + fi # Install gdbinit sample CT_EndStep fi |