Toolchain detection: Allow for Windows executable name and not-yet-configured toolchain path
Windows executable name based on fix suggested by @krzysztof
This commit is contained in:
parent
ee9fb10e29
commit
233fde166b
|
@ -429,22 +429,26 @@ $(foreach submodule,$(subst $(IDF_PATH)/,,$(filter $(IDF_PATH)/%,$(COMPONENT_SUB
|
||||||
# The part in brackets is extracted into TOOLCHAIN_COMMIT_DESC variable,
|
# The part in brackets is extracted into TOOLCHAIN_COMMIT_DESC variable,
|
||||||
# the part after the brackets is extracted into TOOLCHAIN_GCC_VER.
|
# the part after the brackets is extracted into TOOLCHAIN_GCC_VER.
|
||||||
ifndef MAKE_RESTARTS
|
ifndef MAKE_RESTARTS
|
||||||
TOOLCHAIN_COMMIT_DESC := $(shell $(CC) --version | sed -E -n 's|xtensa-esp32-elf-gcc\ \(([^)]*).*|\1|gp')
|
TOOLCHAIN_COMMIT_DESC := $(shell $(CC) --version | sed -E -n 's|xtensa-esp32-elf-gcc.*?\ \(([^)]*).*|\1|gp')
|
||||||
TOOLCHAIN_GCC_VER := $(shell $(CC) --version | sed -E -n 's|xtensa-esp32-elf-gcc\ \(.*\)\ (.*)|\1|gp')
|
TOOLCHAIN_GCC_VER := $(shell $(CC) --version | sed -E -n 's|xtensa-esp32-elf-gcc.*?\ \(.*\)\ (.*)|\1|gp')
|
||||||
|
|
||||||
# Officially supported version(s)
|
# Officially supported version(s)
|
||||||
SUPPORTED_TOOLCHAIN_COMMIT_DESC := crosstool-NG crosstool-ng-1.22.0-61-gab8375a
|
SUPPORTED_TOOLCHAIN_COMMIT_DESC := crosstool-NG crosstool-ng-1.22.0-61-gab8375a
|
||||||
SUPPORTED_TOOLCHAIN_GCC_VERSIONS := 5.2.0
|
SUPPORTED_TOOLCHAIN_GCC_VERSIONS := 5.2.0
|
||||||
|
|
||||||
|
ifdef TOOLCHAIN_COMMIT_DESC
|
||||||
ifneq ($(TOOLCHAIN_COMMIT_DESC), $(SUPPORTED_TOOLCHAIN_COMMIT_DESC))
|
ifneq ($(TOOLCHAIN_COMMIT_DESC), $(SUPPORTED_TOOLCHAIN_COMMIT_DESC))
|
||||||
$(info WARNING: Toolchain version is not supported: $(TOOLCHAIN_COMMIT_DESC))
|
$(info WARNING: Toolchain version is not supported: $(TOOLCHAIN_COMMIT_DESC))
|
||||||
$(info Expected to see version: $(SUPPORTED_TOOLCHAIN_COMMIT_DESC))
|
$(info Expected to see version: $(SUPPORTED_TOOLCHAIN_COMMIT_DESC))
|
||||||
$(info Please check ESP-IDF setup instructions and update the toolchain, or proceed at your own risk.)
|
$(info Please check ESP-IDF setup instructions and update the toolchain, or proceed at your own risk.)
|
||||||
endif
|
endif
|
||||||
ifeq (,$(findstring $(TOOLCHAIN_GCC_VER), $(SUPPORTED_TOOLCHAIN_GCC_VERSIONS)))
|
ifeq (,$(findstring $(TOOLCHAIN_GCC_VER), $(SUPPORTED_TOOLCHAIN_GCC_VERSIONS)))
|
||||||
$(warning WARNING: Compiler version is not supported: $(TOOLCHAIN_GCC_VER))
|
$(info WARNING: Compiler version is not supported: $(TOOLCHAIN_GCC_VER))
|
||||||
$(info Expected to see version(s): $(SUPPORTED_TOOLCHAIN_GCC_VERSIONS))
|
$(info Expected to see version(s): $(SUPPORTED_TOOLCHAIN_GCC_VERSIONS))
|
||||||
$(info Please check ESP-IDF setup instructions and update the toolchain, or proceed at your own risk.)
|
$(info Please check ESP-IDF setup instructions and update the toolchain, or proceed at your own risk.)
|
||||||
endif
|
endif
|
||||||
endif #MAKE_RESTARTS
|
else
|
||||||
|
$(info WARNING: Failed to find Xtensa toolchain, may need to alter PATH or set one in the configuration menu)
|
||||||
|
endif # TOOLCHAIN_COMMIT_DESC
|
||||||
|
endif #MAKE_RESTARTS
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue