From dfe9efd35f353439c299ee52daf43469ea2ca84d Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Mon, 23 Apr 2007 21:03:49 +0000
Subject: Fixed a non-fatal bug in a sed expression. Some cosmetics as well.


diff --git a/scripts/build/cc_gcc.sh b/scripts/build/cc_gcc.sh
index 31cbf6d..1a1bcdc 100644
--- a/scripts/build/cc_gcc.sh
+++ b/scripts/build/cc_gcc.sh
@@ -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 @@ do_cc() {
     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 @@ do_cc() {
         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 --git a/scripts/buildToolchain.sh b/scripts/buildToolchain.sh
index 0c2a587..a1bb18a 100644
--- a/scripts/buildToolchain.sh
+++ b/scripts/buildToolchain.sh
@@ -111,7 +111,7 @@ PARALLELMFLAGS=
 [ ${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}"
-- 
cgit v0.10.2-6-g49f6