1.1 --- a/scripts/build/debug/300-gdb.sh Sun Mar 03 17:15:56 2013 +0100
1.2 +++ b/scripts/build/debug/300-gdb.sh Sun Mar 03 17:17:55 2013 +0100
1.3 @@ -123,6 +123,8 @@
1.4 cd "${CT_BUILD_DIR}/build-gdb-cross"
1.5
1.6 cross_extra_config=("${extra_config[@]}")
1.7 + cross_extra_config+=("--enable-expat")
1.8 + cross_extra_config+=("--with-expat=yes")
1.9 case "${CT_THREADS}" in
1.10 none) cross_extra_config+=("--disable-threads");;
1.11 *) cross_extra_config+=("--enable-threads");;
1.12 @@ -137,6 +139,9 @@
1.13 else
1.14 cross_extra_config+=( "--disable-sim" )
1.15 fi
1.16 + if [ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ]; then
1.17 + cross_extra_config+=("--disable-nls")
1.18 + fi
1.19
1.20 CC_for_gdb=
1.21 LD_for_gdb=
1.22 @@ -145,21 +150,12 @@
1.23 LD_for_gdb="ld -static"
1.24 fi
1.25
1.26 - cross_extra_config+=("--enable-expat")
1.27 - cross_extra_config+=("--with-expat=yes")
1.28 -
1.29 - if [ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ]; then
1.30 - cross_extra_config+=("--disable-nls")
1.31 - fi
1.32 -
1.33 - gdb_cross_configure="${gdb_src_dir}/configure"
1.34 -
1.35 CT_DoLog DEBUG "Extra config passed: '${cross_extra_config[*]}'"
1.36
1.37 CT_DoExecLog CFG \
1.38 CC="${CC_for_gdb}" \
1.39 LD="${LD_for_gdb}" \
1.40 - "${gdb_cross_configure}" \
1.41 + "${gdb_src_dir}/configure" \
1.42 --build=${CT_BUILD} \
1.43 --host=${CT_HOST} \
1.44 --target=${CT_TARGET} \
1.45 @@ -183,7 +179,7 @@
1.46 fi
1.47
1.48 if [ "${CT_GDB_INSTALL_GDBINIT}" = "y" ]; then
1.49 - CT_DoLog EXTRA "Install '.gdbinit' template"
1.50 + CT_DoLog EXTRA "Installing '.gdbinit' template"
1.51 # See in scripts/build/internals.sh for why we do this
1.52 if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ]; then
1.53 gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" )