Pārlūkot izejas kodu

toolchain: Set the supported toolchain version in a separate file

Anton Maklakov 7 gadi atpakaļ
vecāks
revīzija
ab21644df4
2 mainītis faili ar 7 papildinājumiem un 3 dzēšanām
  1. 2 3
      make/project.mk
  2. 5 0
      tools/toolchain_versions.mk

+ 2 - 3
make/project.mk

@@ -567,12 +567,11 @@ print_flash_cmd: partition_table_get_info blank_ota_data
 # the part after the brackets is extracted into TOOLCHAIN_GCC_VER.
 ifdef CONFIG_TOOLPREFIX
 ifndef MAKE_RESTARTS
-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')
+TOOLCHAIN_COMMIT_DESC := $(shell $(CC) --version | sed -E -n 's|.*\(crosstool-NG (.*)\).*|\1|gp')
 TOOLCHAIN_GCC_VER := $(shell $(CC) --version | sed -E -n 's|xtensa-esp32-elf-gcc.*\ \(.*\)\ (.*)|\1|gp')
 
 # Officially supported version(s)
-SUPPORTED_TOOLCHAIN_COMMIT_DESC := 1.22.0-80-g6c4433a
-SUPPORTED_TOOLCHAIN_GCC_VERSIONS := 5.2.0
+include $(IDF_PATH)/tools/toolchain_versions.mk
 
 ifdef TOOLCHAIN_COMMIT_DESC
 ifneq ($(TOOLCHAIN_COMMIT_DESC), $(SUPPORTED_TOOLCHAIN_COMMIT_DESC))

+ 5 - 0
tools/toolchain_versions.mk

@@ -0,0 +1,5 @@
+SUPPORTED_TOOLCHAIN_COMMIT_DESC = crosstool-ng-1.22.0-80-g6c4433a
+SUPPORTED_TOOLCHAIN_GCC_VERSIONS = 5.2.0
+
+CURRENT_TOOLCHAIN_COMMIT_DESC = crosstool-ng-1.22.0-80-g6c4433a
+CURRENT_TOOLCHAIN_GCC_VERSION = 5.2.0