From 81693d41b1b76528601202d6b1d28a0e474cfcce Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 21 Jun 2017 15:25:36 -0700 Subject: [PATCH] crossgcc: cosmetic overhaul of output Straighten up output from the buildgcc script Change-Id: Iee6775b97560063bbdff0d31ceab2dddc58783b3 Signed-off-by: Stefan Reinauer Reviewed-on: https://review.coreboot.org/20302 Tested-by: build bot (Jenkins) Reviewed-by: Nico Huber --- util/crossgcc/buildgcc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index a5d4159997..b388afbebe 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -854,7 +854,7 @@ esac case "$PACKAGE" in GCC|gcc) - echo "Target architecture is now $TARGETARCH" + echo "Target architecture is $TARGETARCH" NAME="${TARGETARCH} cross GCC" PACKAGES="GMP MPFR MPC LIBELF BINUTILS GCC" ;; @@ -867,7 +867,8 @@ case "$PACKAGE" in fi ;; CLANG|clang) - NAME=clang + NAME="LLVM clang" + LLVM_VERSION=${CLANG_VERSION} PACKAGES="CMAKE LLVM CFE CRT CTE" CMAKE=${DESTDIR}${TARGETDIR}/bin/cmake ;; @@ -913,11 +914,11 @@ searchtool xz "XZ Utils" "" "xz-utils" > /dev/null if searchtool wget "GNU" nofail > /dev/null; then download_showing_percentage() { url=$1 - printf " ..${red} 0%%" + printf "... ${red} 0%%" wget $url 2>&1 | while read line; do echo $line | grep -o "[0-9]\+%" | awk '{printf("\b\b\b\b%4s", $1)}' done - printf "${NC}" + printf "${NC}\n" } elif searchtool curl "^curl " > /dev/null; then download_showing_percentage() { @@ -1035,4 +1036,4 @@ cp "$PROGNAME" "$DESTDIR$TARGETDIR/share/$PROGNAME-$CROSSGCC_VERSION-$CROSGCC_CO cleanup -printf "\n${green}You can now run your $NAME toolchain from $TARGETDIR.${NC}\n" +printf "\n${green}You can now run $NAME from $TARGETDIR.${NC}\n"