Merge branch 'bugfix/windows_detection_on_make_v3.3' into 'release/v3.3'
Windows detection on Makefiles cleanup (backport v3.3) See merge request espressif/esp-idf!5490
This commit is contained in:
commit
83a9a4dc70
|
@ -3,17 +3,9 @@
|
||||||
LDGEN_SECTIONS_INFO_FILES = $(foreach lib, $(COMPONENT_LIBRARIES), $(BUILD_DIR_BASE)/$(lib)/lib$(lib).a.sections_info)
|
LDGEN_SECTIONS_INFO_FILES = $(foreach lib, $(COMPONENT_LIBRARIES), $(BUILD_DIR_BASE)/$(lib)/lib$(lib).a.sections_info)
|
||||||
LDGEN_FRAGMENT_FILES = $(COMPONENT_LDFRAGMENTS)
|
LDGEN_FRAGMENT_FILES = $(COMPONENT_LDFRAGMENTS)
|
||||||
|
|
||||||
ON_WINDOWS:=n
|
|
||||||
|
|
||||||
ifdef OS
|
|
||||||
ifeq ($(OS),Windows_NT)
|
|
||||||
ON_WINDOWS:=y
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
# Target to generate linker script generator from fragments presented by each of
|
# Target to generate linker script generator from fragments presented by each of
|
||||||
# the components
|
# the components
|
||||||
ifeq ($(ON_WINDOWS),y)
|
ifeq ($(OS),Windows_NT)
|
||||||
define ldgen_process_template
|
define ldgen_process_template
|
||||||
$(BUILD_DIR_BASE)/ldgen.section_infos: $(LDGEN_SECTIONS_INFO_FILES) $(IDF_PATH)/make/ldgen.mk
|
$(BUILD_DIR_BASE)/ldgen.section_infos: $(LDGEN_SECTIONS_INFO_FILES) $(IDF_PATH)/make/ldgen.mk
|
||||||
printf "$(foreach info,$(LDGEN_SECTIONS_INFO_FILES),$(subst \,/,$(shell cygpath -w $(info)))\n)" > $(BUILD_DIR_BASE)/ldgen.section_infos
|
printf "$(foreach info,$(LDGEN_SECTIONS_INFO_FILES),$(subst \,/,$(shell cygpath -w $(info)))\n)" > $(BUILD_DIR_BASE)/ldgen.section_infos
|
||||||
|
@ -31,7 +23,7 @@ $(2): $(1) $(LDGEN_FRAGMENT_FILES) $(SDKCONFIG) $(BUILD_DIR_BASE)/ldgen.section_
|
||||||
--env "COMPONENT_KCONFIGS_PROJBUILD=$(foreach k, $(COMPONENT_KCONFIGS_PROJBUILD), $(shell cygpath -w $(k)))" \
|
--env "COMPONENT_KCONFIGS_PROJBUILD=$(foreach k, $(COMPONENT_KCONFIGS_PROJBUILD), $(shell cygpath -w $(k)))" \
|
||||||
--env "IDF_CMAKE=n"
|
--env "IDF_CMAKE=n"
|
||||||
endef
|
endef
|
||||||
else # ON_WINDOWS
|
else # Windows_NT
|
||||||
define ldgen_process_template
|
define ldgen_process_template
|
||||||
$(BUILD_DIR_BASE)/ldgen.section_infos: $(LDGEN_SECTIONS_INFO_FILES) $(IDF_PATH)/make/ldgen.mk
|
$(BUILD_DIR_BASE)/ldgen.section_infos: $(LDGEN_SECTIONS_INFO_FILES) $(IDF_PATH)/make/ldgen.mk
|
||||||
printf "$(foreach info,$(LDGEN_SECTIONS_INFO_FILES),$(info)\n)" > $(BUILD_DIR_BASE)/ldgen.section_infos
|
printf "$(foreach info,$(LDGEN_SECTIONS_INFO_FILES),$(info)\n)" > $(BUILD_DIR_BASE)/ldgen.section_infos
|
||||||
|
@ -49,7 +41,7 @@ $(2): $(1) $(LDGEN_FRAGMENT_FILES) $(SDKCONFIG) $(BUILD_DIR_BASE)/ldgen.section_
|
||||||
--env "COMPONENT_KCONFIGS_PROJBUILD=$(COMPONENT_KCONFIGS_PROJBUILD)" \
|
--env "COMPONENT_KCONFIGS_PROJBUILD=$(COMPONENT_KCONFIGS_PROJBUILD)" \
|
||||||
--env "IDF_CMAKE=n"
|
--env "IDF_CMAKE=n"
|
||||||
endef
|
endef
|
||||||
endif # ON_WINDOWS
|
endif # Windows_NT
|
||||||
|
|
||||||
define ldgen_create_commands
|
define ldgen_create_commands
|
||||||
$(foreach lib, $(COMPONENT_LIBRARIES), \
|
$(foreach lib, $(COMPONENT_LIBRARIES), \
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
COMPONENT_KCONFIGS := $(foreach component,$(COMPONENT_PATHS),$(wildcard $(component)/Kconfig))
|
COMPONENT_KCONFIGS := $(foreach component,$(COMPONENT_PATHS),$(wildcard $(component)/Kconfig))
|
||||||
COMPONENT_KCONFIGS_PROJBUILD := $(foreach component,$(COMPONENT_PATHS),$(wildcard $(component)/Kconfig.projbuild))
|
COMPONENT_KCONFIGS_PROJBUILD := $(foreach component,$(COMPONENT_PATHS),$(wildcard $(component)/Kconfig.projbuild))
|
||||||
|
|
||||||
ifdef MSYSTEM
|
ifeq ($(OS),Windows_NT)
|
||||||
# kconfiglib requires Windows-style paths for kconfig files
|
# kconfiglib requires Windows-style paths for kconfig files
|
||||||
COMPONENT_KCONFIGS := $(shell cygpath -w $(COMPONENT_KCONFIGS))
|
COMPONENT_KCONFIGS := $(shell cygpath -w $(COMPONENT_KCONFIGS))
|
||||||
COMPONENT_KCONFIGS_PROJBUILD := $(shell cygpath -w $(COMPONENT_KCONFIGS_PROJBUILD))
|
COMPONENT_KCONFIGS_PROJBUILD := $(shell cygpath -w $(COMPONENT_KCONFIGS_PROJBUILD))
|
||||||
|
|
Loading…
Reference in a new issue