From ef4a4105f439f926d2a241d592c0b6fb824172f0 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Wed, 5 Dec 2018 18:29:44 +1100 Subject: [PATCH] make/ldgen: Fix generation of ldgen.section_infos file when shell is bash bash doesn't escape by default from "echo", so use "printf" Closes https://github.com/espressif/esp-idf/pull/2797 Closes https://github.com/espressif/esp-idf/issues/2796 --- make/ldgen.mk | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/make/ldgen.mk b/make/ldgen.mk index 53a20b705..bc7fdc681 100644 --- a/make/ldgen.mk +++ b/make/ldgen.mk @@ -6,17 +6,13 @@ LDGEN_FRAGMENT_FILES = $(COMPONENT_LDFRAGMENTS) # Target to generate linker script generator from fragments presented by each of # the components define ldgen_process_template -ifeq ($(OS), Windows_NT) -$(BUILD_DIR_BASE)/ldgen.section_infos: $(LDGEN_SECTIONS_INFO_FILES) - echo -ne "$(foreach section_info,$(LDGEN_SECTIONS_INFO_FILES),$(section_info)\n)" > $(BUILD_DIR_BASE)/ldgen.section_infos +$(BUILD_DIR_BASE)/ldgen.section_infos: $(LDGEN_SECTIONS_INFO_FILES) $(IDF_PATH)/make/ldgen.mk + printf "$(foreach section_info,$(LDGEN_SECTIONS_INFO_FILES),$(section_info)\n)" > $(BUILD_DIR_BASE)/ldgen.section_infos sed -i 's|^[[:blank:]]*||g' $(BUILD_DIR_BASE)/ldgen.section_infos +ifeq ($(OS), Windows_NT) mv $(BUILD_DIR_BASE)/ldgen.section_infos $(BUILD_DIR_BASE)/ldgen.section_infos.temp cygpath -w -f $(BUILD_DIR_BASE)/ldgen.section_infos.temp > $(BUILD_DIR_BASE)/ldgen.section_infos rm -f $(BUILD_DIR_BASE)/ldgen.section_infos.temp -else -$(BUILD_DIR_BASE)/ldgen.section_infos: $(LDGEN_SECTIONS_INFO_FILES) - echo "$(foreach section_info,$(LDGEN_SECTIONS_INFO_FILES),$(section_info)\n)" > $(BUILD_DIR_BASE)/ldgen.section_infos - sed -i 's|^[[:blank:]]*||g' $(BUILD_DIR_BASE)/ldgen.section_infos endif $(2): $(1) $(LDGEN_FRAGMENT_FILES) $(SDKCONFIG) $(BUILD_DIR_BASE)/ldgen.section_infos