summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2015-10-28 21:08:31 (GMT)
committerAlexey Neyman <stilor@att.net>2015-10-30 23:24:52 (GMT)
commit80cbfb9da7bfc02fdd5c6256e3f51182eb811e17 (patch)
treefc5e76a6c747261d6e0b0d9e63332177df5257a0
parent55d8497fea996b070d8e7f6f6898e99e9981337a (diff)
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 <stilor@att.net>
-rwxr-xr-xscripts/showSamples.sh7
1 files changed, 6 insertions, 1 deletions
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}"