From 80cbfb9da7bfc02fdd5c6256e3f51182eb811e17 Mon Sep 17 00:00:00 2001 From: Alexey Neyman Date: Wed, 28 Oct 2015 14:08:31 -0700 Subject: Make show-config consistent with sample name. 'ct-ng show-config' will prepend host for canadian builds; otherwise, the name is different from the name used to configure the build (and indistinguishable from a simple cross). Signed-off-by: Alexey Neyman diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh index 684e118..76609f2 100755 --- a/scripts/showSamples.sh +++ b/scripts/showSamples.sh @@ -23,10 +23,16 @@ dump_single_sample() { [ "$1" = "-v" ] && verbose=1 && shift [ "$1" = "-w" ] && wiki=1 && shift local sample="$1" + . $(pwd)/.config.sample case "${sample}" in current) sample_type="l" sample="$( ${CT_NG} show-tuple )" + case "${CT_TOOLCHAIN_TYPE}" in + canadian) + sample="${CT_HOST},$sample" + ;; + esac ;; *) if [ -f "${CT_TOP_DIR}/samples/${sample}/crosstool.config" ]; then sample_top="${CT_TOP_DIR}" @@ -37,7 +43,6 @@ dump_single_sample() { fi ;; esac - . $(pwd)/.config.sample if [ ${wiki} -eq 0 ]; then width=14 printf "[%s" "${sample_type}" -- cgit v0.10.2-6-g49f6