Skip to content

Commit 3ffcb12

Browse files
committed
Merge branch 'feature/modify_make_script' into 'master'
feat(make): Remove compiler checking warning See merge request sdk/ESP8266_RTOS_SDK!172
2 parents e0a3a60 + cce0ee6 commit 3ffcb12

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

components/esp8266/Makefile.projbuild

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
SUPPORTED_TOOLCHAIN_COMMIT_DESC := 1.22.0-88-gde0bdc1
2+
SUPPORTED_TOOLCHAIN_GCC_VERSIONS := 4.8.5
3+
14
ifdef CONFIG_ESP8266_LEGACY
25

36
BOOTLOADER_FIRMWARE_DIR := $(abspath $(COMPONENT_PATH))/firmware

make/project.mk

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -554,22 +554,24 @@ print_flash_cmd:
554554
ifdef CONFIG_TOOLPREFIX
555555
ifndef MAKE_RESTARTS
556556
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')
558558

559559
# 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
562562

563563
ifdef TOOLCHAIN_COMMIT_DESC
564564
ifneq ($(TOOLCHAIN_COMMIT_DESC), $(SUPPORTED_TOOLCHAIN_COMMIT_DESC))
565565
$(info WARNING: Toolchain version is not supported: $(TOOLCHAIN_COMMIT_DESC))
566566
$(info Expected to see version: $(SUPPORTED_TOOLCHAIN_COMMIT_DESC))
567567
$(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)
568569
endif
569570
ifeq (,$(findstring $(TOOLCHAIN_GCC_VER), $(SUPPORTED_TOOLCHAIN_GCC_VERSIONS)))
570571
$(info WARNING: Compiler version is not supported: $(TOOLCHAIN_GCC_VER))
571572
$(info Expected to see version(s): $(SUPPORTED_TOOLCHAIN_GCC_VERSIONS))
572573
$(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)
573575
endif
574576
else
575577
$(info WARNING: Failed to find Xtensa toolchain, may need to alter PATH or set one in the configuration menu)

0 commit comments

Comments
 (0)