1.1 --- a/scripts/build/debug/300-gdb.sh	Tue Mar 24 17:39:45 2009 +0000
     1.2 +++ b/scripts/build/debug/300-gdb.sh	Mon Mar 30 21:17:21 2009 +0000
     1.3 @@ -134,15 +134,17 @@
     1.4      if [ "${CT_GDB_NATIVE}" = "y" ]; then
     1.5          CT_DoStep INFO "Installing native gdb"
     1.6  
     1.7 +        CT_DoStep INFO "Installing ncurses library"
     1.8 +
     1.9 +        ncurses_opts=
    1.10 +        [ "${CT_CC_LANG_CXX}" = "y" ] || ncurses_opts="${ncurses_opts} --without-cxx --without-cxx-binding"
    1.11 +        [ "${CT_CC_LANG_ADA}" = "y" ] || ncurses_opts="${ncurses_opts} --without-ada"
    1.12 +
    1.13          CT_DoStep INFO "Installing native ncurses tic"
    1.14          CT_DoLog EXTRA "Configuring ncurses tic"
    1.15          mkdir -p "${CT_BUILD_DIR}/build-ncurses-build-tic"
    1.16          cd "${CT_BUILD_DIR}/build-ncurses-build-tic"
    1.17  
    1.18 -        ncurses_opts=
    1.19 -        [ "${CT_CC_LANG_CXX}" = "y" ] || ncurses_opts="${ncurses_opts} --without-cxx --without-cxx-binding"
    1.20 -        [ "${CT_CC_LANG_ADA}" = "y" ] || ncurses_opts="${ncurses_opts} --without-ada"
    1.21 -
    1.22          # Use build = CT_REAL_BUILD so that configure thinks it is
    1.23          # cross-compiling, and thus will use the ${CT_BUILD}-*
    1.24          # tools instead of searching for the native ones...
    1.25 @@ -170,17 +172,12 @@
    1.26          CT_DoExecLog ALL install -d -m 0755 "${CT_PREFIX_DIR}/bin"
    1.27          CT_DoExecLog ALL install -m 0755 "progs/tic${tic_ext}" "${CT_PREFIX_DIR}/bin"
    1.28  
    1.29 -        CT_EndStep
    1.30 +        CT_EndStep # tic build
    1.31  
    1.32 -        CT_DoStep INFO "Installing ncurses library"
    1.33          CT_DoLog EXTRA "Configuring ncurses"
    1.34          mkdir -p "${CT_BUILD_DIR}/build-ncurses"
    1.35          cd "${CT_BUILD_DIR}/build-ncurses"
    1.36  
    1.37 -        ncurses_opts=
    1.38 -        [ "${CT_CC_LANG_CXX}" = "y" ] || ncurses_opts="${ncurses_opts} --without-cxx --without-cxx-binding"
    1.39 -        [ "${CT_CC_LANG_ADA}" = "y" ] || ncurses_opts="${ncurses_opts} --without-ada"
    1.40 -
    1.41          CT_DoExecLog ALL                                        \
    1.42          "${CT_SRC_DIR}/ncurses-${CT_NCURSES_VERSION}/configure" \
    1.43              --build=${CT_BUILD}                                 \
    1.44 @@ -202,7 +199,10 @@
    1.45          mkdir -p "${CT_SYSROOT_DIR}/usr/bin"
    1.46          CT_DoExecLog ALL make DESTDIR="${CT_SYSROOT_DIR}" install
    1.47  
    1.48 -        CT_EndStep
    1.49 +        # We no longer need the temporary tic. Remove it
    1.50 +        CT_DoExecLog DEBUG rm -fv "${CT_PREFIX_DIR}/bin/tic"
    1.51 +
    1.52 +        CT_EndStep # ncurses build
    1.53  
    1.54          CT_DoLog EXTRA "Configuring native gdb"
    1.55  
    1.56 @@ -260,7 +260,7 @@
    1.57  
    1.58          unset ac_cv_func_strncmp_works
    1.59  
    1.60 -        CT_EndStep
    1.61 +        CT_EndStep # native gdb build
    1.62      fi
    1.63  
    1.64      if [ "${CT_GDB_GDBSERVER}" = "y" ]; then