diff options
| author | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-04 02:50:05 -0800 |
|---|---|---|
| committer | Bryan Hundven <bryanhundven@gmail.com> | 2015-11-04 02:50:05 -0800 |
| commit | 85f98147f57b3001282fc0365be245b9c81a3a16 (patch) | |
| tree | 5f5287226ebc2039b016deff29eea450409c900f /scripts | |
| parent | 5ffc9ecd10dec73024f8e7f3815c7b2f0851ba56 (diff) | |
| parent | b2f8afef8532247c60764fffc938898903c06a4c (diff) | |
| download | crosstool-ng-85f98147f57b3001282fc0365be245b9c81a3a16.tar.gz crosstool-ng-85f98147f57b3001282fc0365be245b9c81a3a16.tar.bz2 crosstool-ng-85f98147f57b3001282fc0365be245b9c81a3a16.zip | |
Merge pull request #233 from stilor/fix-build-all
Fix build-all
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/functions | 4 | ||||
| -rw-r--r-- | scripts/scripts.mk | 8 | ||||
| -rwxr-xr-x | scripts/showSamples.sh | 7 |
3 files changed, 12 insertions, 7 deletions
diff --git a/scripts/functions b/scripts/functions index 86653465..2261b8d0 100644 --- a/scripts/functions +++ b/scripts/functions @@ -14,7 +14,7 @@ CT_OnError() { # To avoid printing the backtace for each sub-shell # up to the top-level, just remember we've dumped it if [ ! -f "${CT_WORK_DIR}/backtrace" ]; then - touch "${CT_WORK_DIR}/backtrace" + [ -d "${CT_WORK_DIR}" ] && touch "${CT_WORK_DIR}/backtrace" # Print steps backtrace step_depth=${CT_STEP_COUNT} @@ -178,7 +178,7 @@ CT_DoLog() { if [ $# -eq 0 ]; then cat - else - printf "%s\n" "${*}" + echo -e "${*}" fi |( IFS="${CR}" # We want the full lines, even leading spaces _prog_bar_cpt=0 _prog_bar[0]='/' diff --git a/scripts/scripts.mk b/scripts/scripts.mk index 8373f9bf..77368a7e 100644 --- a/scripts/scripts.mk +++ b/scripts/scripts.mk @@ -33,16 +33,16 @@ endif PHONY += scripts scripts: - @$(ECHO) ' MKDIR $@' + @$(CT_ECHO) ' MKDIR $@' $(SILENT)mkdir -p $@ $(CONFIG_SUB_DEST): scripts FORCE - @$(ECHO) ' WGET $@' + @$(CT_ECHO) ' WGET $@' $(SILENT)wget $(wget_opt) -O $@ $(CONFIG_SUB_SRC) $(SILENT)chmod u+rwx,go+rx-w $@ $(CONFIG_GUESS_DEST): scripts FORCE - @$(ECHO) ' WGET $@' + @$(CT_ECHO) ' WGET $@' $(SILENT)wget $(wget_opt) -O $@ $(CONFIG_GUESS_SRC) $(SILENT)chmod u+rwx,go+rx-w $@ @@ -50,5 +50,5 @@ $(CONFIG_GUESS_DEST): scripts FORCE # Clean up the mess distclean:: - @$(ECHO) " CLEAN scripts" + @$(CT_ECHO) " CLEAN scripts" $(SILENT)[ $(CT_TOP_DIR) = $(CT_LIB_DIR) ] || rm -rf $(CT_TOP_DIR)/scripts diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh index 684e1184..76609f25 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}" |