Fixed a non-fatal bug in a sed expression.
Some cosmetics as well.
1.1 --- a/scripts/build/cc_gcc.sh Mon Apr 23 20:30:34 2007 +0000
1.2 +++ b/scripts/build/cc_gcc.sh Mon Apr 23 21:03:49 2007 +0000
1.3 @@ -3,12 +3,12 @@
1.4 # Licensed under the GPL v2. See COPYING in the root of this package
1.5
1.6 do_cc() {
1.7 - CT_DoStep INFO "Installing final C compiler"
1.8 + CT_DoStep INFO "Installing final compiler"
1.9
1.10 mkdir -p "${CT_BUILD_DIR}/build-cc"
1.11 cd "${CT_BUILD_DIR}/build-cc"
1.12
1.13 - CT_DoLog EXTRA "Configuring C compiler"
1.14 + CT_DoLog EXTRA "Configuring compiler"
1.15
1.16 # Enable selected languages
1.17 lang_opt="c"
1.18 @@ -24,7 +24,7 @@
1.19 CT_Test "Building Objective-C language is not yet supported. Will try..." "${CT_CC_LANG_OBJC}" = "y"
1.20 CT_Test "Building Objective-C++ language is not yet supported. Will try..." "${CT_CC_LANG_OBJCXX}" = "y"
1.21 CT_Test "Building ${CT_CC_LANG_OTHERS} language(s) is not yet supported. Will try..." -n "${CT_CC_LANG_OTHERS}"
1.22 - lang_opt=`echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/^(.*),*$/\1/;'`
1.23 + lang_opt=`echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;'`
1.24
1.25 extra_config="--enable-languages=${lang_opt}"
1.26 [ "${CT_ARCH_FLOAT_SW}" = "y" ] && extra_config="${extra_config} --with-float=soft"
1.27 @@ -88,7 +88,7 @@
1.28 esac ;;
1.29 esac
1.30
1.31 - CT_DoLog EXTRA "Building C compiler"
1.32 + CT_DoLog EXTRA "Building compiler"
1.33 make ${PARALLELMFLAGS} all 2>&1 |CT_DoLog DEBUG
1.34
1.35 CT_DoLog EXTRA "Installing C compiler"
2.1 --- a/scripts/buildToolchain.sh Mon Apr 23 20:30:34 2007 +0000
2.2 +++ b/scripts/buildToolchain.sh Mon Apr 23 21:03:49 2007 +0000
2.3 @@ -111,7 +111,7 @@
2.4 [ ${CT_LOAD} -ne 0 ] && PARALLELMFLAGS="${PARALLELMFLAGS} -l${CT_LOAD}"
2.5
2.6 CT_DoStep EXTRA "Dumping internal crosstool-NG configuration"
2.7 -CT_DoLog EXTRA "Building a toolchain for :"
2.8 +CT_DoLog EXTRA "Building a toolchain for:"
2.9 CT_DoLog EXTRA " build = ${CT_BUILD}"
2.10 CT_DoLog EXTRA " host = ${CT_HOST}"
2.11 CT_DoLog EXTRA " target = ${CT_TARGET}"