@@ -554,22 +554,24 @@ print_flash_cmd:
554
554
ifdef CONFIG_TOOLPREFIX
555
555
ifndef MAKE_RESTARTS
556
556
TOOLCHAIN_COMMIT_DESC := $(shell $(CC ) --version | sed -E -n 's|.* crosstool-ng-([0-9]+) .([0-9]+).([0-9]+)-([0-9]+)-g([0-9a-f]{7}).*|\1.\2.\3-\4-g\5|gp')
557
- TOOLCHAIN_GCC_VER := $(shell $(CC ) --version | sed -E -n 's|xtensa-esp32-elf- gcc.* \ \(.* \) \ (.*)|\1|gp')
557
+ TOOLCHAIN_GCC_VER := $(shell $(CC ) --version | sed -E -n 's|. * gcc.* \ \(.* \) \ (.*)|\1|gp')
558
558
559
559
# Officially supported version(s)
560
- SUPPORTED_TOOLCHAIN_COMMIT_DESC : = 1.22.0-80-g6c4433a
561
- SUPPORTED_TOOLCHAIN_GCC_VERSIONS : = 5.2.0
560
+ SUPPORTED_TOOLCHAIN_COMMIT_DESC ? = 1.22.0-80-g6c4433a
561
+ SUPPORTED_TOOLCHAIN_GCC_VERSIONS ? = 5.2.0
562
562
563
563
ifdef TOOLCHAIN_COMMIT_DESC
564
564
ifneq ($(TOOLCHAIN_COMMIT_DESC ) , $(SUPPORTED_TOOLCHAIN_COMMIT_DESC ) )
565
565
$(info WARNING : Toolchain version is not supported: $(TOOLCHAIN_COMMIT_DESC ) )
566
566
$(info Expected to see version : $(SUPPORTED_TOOLCHAIN_COMMIT_DESC ) )
567
567
$(info Please check ESP-IDF setup instructions and update the toolchain, or proceed at your own risk.)
568
+ $(info Please download and use the toolchain from the URL of README.md)
568
569
endif
569
570
ifeq (,$(findstring $(TOOLCHAIN_GCC_VER ) , $(SUPPORTED_TOOLCHAIN_GCC_VERSIONS ) ) )
570
571
$(info WARNING : Compiler version is not supported: $(TOOLCHAIN_GCC_VER ) )
571
572
$(info Expected to see version(s) : $(SUPPORTED_TOOLCHAIN_GCC_VERSIONS ) )
572
573
$(info Please check ESP-IDF setup instructions and update the toolchain, or proceed at your own risk.)
574
+ $(info Please download and use the toolchain from the URL of README.md)
573
575
endif
574
576
else
575
577
$(info WARNING : Failed to find Xtensa toolchain, may need to alter PATH or set one in the configuration menu)
0 commit comments