1.1 --- a/config/debug/gdb.in	Fri Jul 29 13:04:49 2011 +0200
     1.2 +++ b/config/debug/gdb.in	Sat Jul 30 00:05:53 2011 +0200
     1.3 @@ -73,10 +73,14 @@
     1.4  config GDB_7_0_or_later
     1.5      bool
     1.6      select GDB_HAS_PKGVERSION_BUGURL
     1.7 +    select GDB_INSTALL_GDBINIT
     1.8  
     1.9  config GDB_HAS_PKGVERSION_BUGURL
    1.10      bool
    1.11  
    1.12 +config GDB_INSTALL_GDBINIT
    1.13 +    bool
    1.14 +
    1.15  config GDB_VERSION
    1.16      string
    1.17  # Don't remove next line

     2.1 --- a/scripts/build/debug/300-gdb.sh	Fri Jul 29 13:04:49 2011 +0200
     2.2 +++ b/scripts/build/debug/300-gdb.sh	Sat Jul 30 00:05:53 2011 +0200
     2.3 @@ -150,20 +150,22 @@
     2.4          CT_DoLog EXTRA "Installing cross-gdb"
     2.5          CT_DoExecLog ALL make install
     2.6  
     2.7 -        CT_DoLog EXTRA "Install '.gdbinit' template"
     2.8 -        # See in scripts/build/internals.sh for why we do this
     2.9 -        if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ]; then
    2.10 -            gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" )
    2.11 -        else
    2.12 -            gcc_version=$( sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \
    2.13 -                               "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/version.c"   \
    2.14 -                         )
    2.15 -        fi
    2.16 -        ${sed} -r                                               \
    2.17 -               -e "s:@@PREFIX@@:${CT_PREFIX_DIR}:;"             \
    2.18 -               -e "s:@@VERSION@@:${gcc_version}:;"              \
    2.19 -               "${CT_LIB_DIR}/scripts/build/debug/gdbinit.in"   \
    2.20 -               >"${CT_PREFIX_DIR}/share/gdb/gdbinit"
    2.21 +        if [ "${CT_GDB_INSTALL_GDBINIT}" = "y" ]; then
    2.22 +            CT_DoLog EXTRA "Install '.gdbinit' template"
    2.23 +            # See in scripts/build/internals.sh for why we do this
    2.24 +            if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ]; then
    2.25 +                gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" )
    2.26 +            else
    2.27 +                gcc_version=$( sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \
    2.28 +                                   "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/version.c"   \
    2.29 +                             )
    2.30 +            fi
    2.31 +            ${sed} -r                                               \
    2.32 +                   -e "s:@@PREFIX@@:${CT_PREFIX_DIR}:;"             \
    2.33 +                   -e "s:@@VERSION@@:${gcc_version}:;"              \
    2.34 +                   "${CT_LIB_DIR}/scripts/build/debug/gdbinit.in"   \
    2.35 +                   >"${CT_PREFIX_DIR}/share/gdb/gdbinit"
    2.36 +        fi # Install gdbinit sample
    2.37  
    2.38          CT_EndStep
    2.39      fi