From 5739495c35fed59ea08ecfdf1262ec476c4686b9 Mon Sep 17 00:00:00 2001
From: Bryan Hundven <bryanhundven@gmail.com>
Date: Tue, 17 Nov 2015 11:41:08 -0800
Subject: showSamples.sh: Fix how we get gcc and version for showSamples.sh

I'm not even sure how the previous loop was supposed to work.
The config variables are not exported to the environment.
Now we properly get which cc we are using and grab the version to
display it correctly with the output of wiki-samples.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>

diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh
index f624119..20c5a70 100755
--- a/scripts/showSamples.sh
+++ b/scripts/showSamples.sh
@@ -88,12 +88,10 @@ dump_single_sample() {
             [ -z "${complibs}"  ] || printf "\n"
             printf  "    %-*s : %s\n" ${width} "binutils" "binutils-${CT_BINUTILS_VERSION}"
             printf  "    %-*s :" ${width} "C compilers"
-            for cc in $(env | ${sed} -n 's/^CT_CC_\(.*\)_VERSION.*/\1/p'); do
-                cc_variable=CT_CC_${cc}_VERSION
-                version=${!cc_variable}
-                compiler=$(echo $cc | ${awk} '{print tolower($0)}')
-                printf " $compiler-$version"
-            done
+            cc=$(echo ${CT_CC} | ${awk} '{ print toupper($0)}')
+            version=$(eval echo \${CT_CC_${cc}_VERSION})
+            compiler=$(echo $cc | ${awk} '{print tolower($0)}')
+            printf " $compiler  |  $version"
             printf "\n"
             printf  "    %-*s : %s" ${width} "Languages" "C"
             [ "${CT_CC_LANG_CXX}" = "y"     ] && printf ",C++"
@@ -140,12 +138,10 @@ dump_single_sample() {
         fi
         printf "|  ${CT_BINUTILS_VERSION}  "
         printf "| "
-        for cc in $(env | ${sed} -n 's/^CT_CC_\(.*\)_VERSION.*/\1/p'); do
-            cc_variable=CT_CC_${cc}_VERSION
-            version=${!cc_variable}
-            compiler=$(echo $cc | ${awk} '{print tolower($0)}')
-            printf " $compiler-$version"
-         done
+        cc=$(echo ${CT_CC} | ${awk} '{ print toupper($0)}')
+        version=$(eval echo \${CT_CC_${cc}_VERSION})
+        compiler=$(echo $cc | ${awk} '{print tolower($0)}')
+        printf " $compiler  |  $version"
         printf "  "
         printf "|  ''${CT_LIBC}''  |"
         if [ "${CT_LIBC}" != "none" ]; then
-- 
cgit v0.10.2-6-g49f6