summaryrefslogtreecommitdiff
path: root/samples
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2015-10-30 02:34:24 (GMT)
committerAlexey Neyman <stilor@att.net>2015-10-30 23:24:52 (GMT)
commit5844514e74eac69b71c1e1661676dd88e4450610 (patch)
treec59b6d1ebfb892cd69cdc6019ca9c28a9ad5d3fb /samples
parent1ad356c1789523ea7124108db8fd4b834e50558d (diff)
Fix samples using GMP 4.3.2.
Some older versions of configure (including the one in GMP 4.3.2) interpret the $ECHO environment variable as the `echo' utility to use. CT-NG sets the variable to `:' and exports it if V=0 or V=1 is supplied, breaking the samples using such configure. This currently includes bfin-unknown-linux-uclibc and powerpc-unknown-linux-uclibc. Also, correct the description of the V= variable - V=0 is *not* the default; in fact, default does not correspond to any of the V=[012] values. Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'samples')
-rw-r--r--samples/samples.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/samples/samples.mk b/samples/samples.mk
index 7f5a36c..e9730de 100644
--- a/samples/samples.mk
+++ b/samples/samples.mk
@@ -117,7 +117,7 @@ $(patsubst %,wiki-%,$(CT_SAMPLES)): config_files
PHONY += samples
samples:
- @$(ECHO) ' MKDIR $@'
+ @$(CT_ECHO) ' MKDIR $@'
$(SILENT)mkdir -p $@
# Save a sample
@@ -133,7 +133,7 @@ endef
# How we do recall one sample
PHONY += $(CT_SAMPLES)
$(CT_SAMPLES): config_files
- @$(ECHO) " CONF $(KCONFIG_TOP)"
+ @$(CT_ECHO) " CONF $(KCONFIG_TOP)"
$(SILENT)$(CONF) --defconfig=$(call sample_dir,$@)/crosstool.config $(KCONFIG_TOP)
@echo
@echo '***********************************************************'
@@ -176,7 +176,7 @@ host_triplet = $(if $(findstring $(__comma),$(1)),$(firstword $(subst $(__comma)
# Create the rule to build a sample
# $1: sample name (target tuple, or host/target tuples separated by a comma)
define build_sample
- @$(ECHO) ' CONF $(1)'
+ @$(CT_ECHO) ' CONF $(1)'
$(SILENT)$(CONF) -s --defconfig=$(call sample_dir,$(1))/crosstool.config $(KCONFIG_TOP)
$(SILENT)$(sed) -i -r -e 's:^(CT_PREFIX_DIR=).*$$:\1"$(call prefix_dir,$(1))":;' .config
$(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_(WARN|INFO|EXTRA|DEBUG|ALL)).*$$:# \1 is not set:;' .config
@@ -185,7 +185,7 @@ define build_sample
$(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_TO_FILE).*$$:\1=y:;' .config
$(SILENT)$(sed) -i -r -e 's:^.*(CT_LOG_PROGRESS_BAR).*$$:\1=y:;' .config
$(SILENT)$(CONF) -s --oldconfig $(KCONFIG_TOP)
- @$(ECHO) ' BUILD $(1)'
+ @$(CT_ECHO) ' BUILD $(1)'
$(SILENT)if [ ! -z "$(call host_triplet,$(1))" -a -d "$(call prefix_dir,$(call host_triplet,$(1)))" ]; then \
PATH="$$PATH:$(call prefix_dir,$(call host_triplet,$(1)))/bin"; \
fi; \