diff options
| -rwxr-xr-x | scripts/showSamples.sh | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh index f6241193..8aef5ed2 100755 --- a/scripts/showSamples.sh +++ b/scripts/showSamples.sh @@ -24,6 +24,16 @@ dump_single_sample() { [ "$1" = "-w" ] && wiki=1 && shift local sample="$1" . $(pwd)/.config.sample + + # libc needs some love + local libc_name="${CT_LIBC}" + local libc_ver="${CT_LIBC_VERSION}" + if [ "${CT_LIBC}" = "uClibc" -a "${CT_LIBC_UCLIBC_NG}" = "y" ]; then + libc_name="uClibc-ng" + elif [ "${CT_LIBC}" = "mingw" ]; then + libc_ver="${CT_WINAPI_VERSION}" + fi + case "${sample}" in current) sample_type="l" @@ -88,12 +98,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++" @@ -105,7 +113,7 @@ dump_single_sample() { [ "${CT_CC_LANG_GOLANG}" = "y" ] && printf ",Go" [ -n "${CT_CC_LANG_OTHERS}" ] && printf ",${CT_CC_LANG_OTHERS}" printf "\n" - printf " %-*s : %s (threads: %s)\n" ${width} "C library" "${CT_LIBC}${CT_LIBC_VERSION:+-}${CT_LIBC_VERSION}" "${CT_THREADS}" + printf " %-*s : %s (threads: %s)\n" ${width} "C library" "${libc_name}${libc_ver:+-}${libc_ver}" "${CT_THREADS}" printf " %-*s :" ${width} "Tools" [ "${CT_TOOL_sstrip}" ] && printf " sstrip" [ "${CT_DEBUG_dmalloc}" ] && printf " dmalloc-${CT_DMALLOC_VERSION}" @@ -140,16 +148,14 @@ 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 - printf " ${CT_LIBC_VERSION} " + printf "| ''${libc_name}'' |" + if [ "${libc_name}" != "none" ]; then + printf " ${libc_ver} " fi printf "| ${CT_THREADS:-none} " printf "| ${CT_ARCH_FLOAT} " |