From ab21644df4f392c331cfb6fc7c18ce83f8b1682b Mon Sep 17 00:00:00 2001 From: Anton Maklakov Date: Mon, 27 Aug 2018 11:04:08 +0800 Subject: [PATCH] toolchain: Set the supported toolchain version in a separate file --- make/project.mk | 5 ++--- tools/toolchain_versions.mk | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 tools/toolchain_versions.mk diff --git a/make/project.mk b/make/project.mk index 364f72970..abf2a528c 100644 --- a/make/project.mk +++ b/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)) diff --git a/tools/toolchain_versions.mk b/tools/toolchain_versions.mk new file mode 100644 index 000000000..c1a7aa059 --- /dev/null +++ b/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