summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@free.fr>2013-03-03 16:17:55 (GMT)
committerYann E. MORIN" <yann.morin.1998@free.fr>2013-03-03 16:17:55 (GMT)
commita5491bd775271074c9e1258f08abb1fdf3a192ea (patch)
treeec13a95f0cbf21f6369613acd26f6aae8e49901d
parent6fef7d640a25b971b1f6bccb6bcff300a5448cce (diff)
debug/gdb: a litle bit of trivial code-reordering
Move all options-setting code at the same place. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
-rw-r--r--scripts/build/debug/300-gdb.sh18
1 files changed, 7 insertions, 11 deletions
diff --git a/scripts/build/debug/300-gdb.sh b/scripts/build/debug/300-gdb.sh
index b50e403..dbc0828 100644
--- a/scripts/build/debug/300-gdb.sh
+++ b/scripts/build/debug/300-gdb.sh
@@ -123,6 +123,8 @@ do_debug_gdb_build() {
cd "${CT_BUILD_DIR}/build-gdb-cross"
cross_extra_config=("${extra_config[@]}")
+ cross_extra_config+=("--enable-expat")
+ cross_extra_config+=("--with-expat=yes")
case "${CT_THREADS}" in
none) cross_extra_config+=("--disable-threads");;
*) cross_extra_config+=("--enable-threads");;
@@ -137,6 +139,9 @@ do_debug_gdb_build() {
else
cross_extra_config+=( "--disable-sim" )
fi
+ if [ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ]; then
+ cross_extra_config+=("--disable-nls")
+ fi
CC_for_gdb=
LD_for_gdb=
@@ -145,21 +150,12 @@ do_debug_gdb_build() {
LD_for_gdb="ld -static"
fi
- cross_extra_config+=("--enable-expat")
- cross_extra_config+=("--with-expat=yes")
-
- if [ "${CT_TOOLCHAIN_ENABLE_NLS}" != "y" ]; then
- cross_extra_config+=("--disable-nls")
- fi
-
- gdb_cross_configure="${gdb_src_dir}/configure"
-
CT_DoLog DEBUG "Extra config passed: '${cross_extra_config[*]}'"
CT_DoExecLog CFG \
CC="${CC_for_gdb}" \
LD="${LD_for_gdb}" \
- "${gdb_cross_configure}" \
+ "${gdb_src_dir}/configure" \
--build=${CT_BUILD} \
--host=${CT_HOST} \
--target=${CT_TARGET} \
@@ -183,7 +179,7 @@ do_debug_gdb_build() {
fi
if [ "${CT_GDB_INSTALL_GDBINIT}" = "y" ]; then
- CT_DoLog EXTRA "Install '.gdbinit' template"
+ CT_DoLog EXTRA "Installing '.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" )