# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1177362229 0
# Node ID d19bdc2c5ffff2d633b2d9997d23cf37e03fc604
# Parent  7e2539937b6e22f876dc92080c4a8c19d2632827
Fixed a non-fatal bug in a sed expression.
Some cosmetics as well.

diff -r 7e2539937b6e -r d19bdc2c5fff scripts/build/cc_gcc.sh
--- a/scripts/build/cc_gcc.sh	Mon Apr 23 20:30:34 2007 +0000
+++ b/scripts/build/cc_gcc.sh	Mon Apr 23 21:03:49 2007 +0000
@@ -3,12 +3,12 @@
 # Licensed under the GPL v2. See COPYING in the root of this package
 
 do_cc() {
-    CT_DoStep INFO "Installing final C compiler"
+    CT_DoStep INFO "Installing final compiler"
 
     mkdir -p "${CT_BUILD_DIR}/build-cc"
     cd "${CT_BUILD_DIR}/build-cc"
 
-    CT_DoLog EXTRA "Configuring C compiler"
+    CT_DoLog EXTRA "Configuring compiler"
 
     # Enable selected languages
     lang_opt="c"
@@ -24,7 +24,7 @@
     CT_Test "Building Objective-C language is not yet supported. Will try..." "${CT_CC_LANG_OBJC}" = "y"
     CT_Test "Building Objective-C++ language is not yet supported. Will try..." "${CT_CC_LANG_OBJCXX}" = "y"
     CT_Test "Building ${CT_CC_LANG_OTHERS} language(s) is not yet supported. Will try..." -n "${CT_CC_LANG_OTHERS}"
-    lang_opt=`echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/^(.*),*$/\1/;'`
+    lang_opt=`echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;'`
 
     extra_config="--enable-languages=${lang_opt}"
     [ "${CT_ARCH_FLOAT_SW}" = "y" ] && extra_config="${extra_config} --with-float=soft"
@@ -88,7 +88,7 @@
         esac ;;
     esac
 
-    CT_DoLog EXTRA "Building C compiler"
+    CT_DoLog EXTRA "Building compiler"
     make ${PARALLELMFLAGS} all 2>&1 |CT_DoLog DEBUG
 
     CT_DoLog EXTRA "Installing C compiler"
diff -r 7e2539937b6e -r d19bdc2c5fff scripts/buildToolchain.sh
--- a/scripts/buildToolchain.sh	Mon Apr 23 20:30:34 2007 +0000
+++ b/scripts/buildToolchain.sh	Mon Apr 23 21:03:49 2007 +0000
@@ -111,7 +111,7 @@
 [ ${CT_LOAD} -ne 0 ] && PARALLELMFLAGS="${PARALLELMFLAGS} -l${CT_LOAD}"
 
 CT_DoStep EXTRA "Dumping internal crosstool-NG configuration"
-CT_DoLog EXTRA "Building a toolchain for :"
+CT_DoLog EXTRA "Building a toolchain for:"
 CT_DoLog EXTRA "  build  = ${CT_BUILD}"
 CT_DoLog EXTRA "  host   = ${CT_HOST}"
 CT_DoLog EXTRA "  target = ${CT_TARGET}"