From daa13b3f6202c221ea0200a2f01ea0928ca61faa Mon Sep 17 00:00:00 2001 From: Renz Bagaporo Date: Wed, 10 Mar 2021 19:47:40 +0800 Subject: [PATCH] esp32: move toolchain check --- components/esp32/project_include.cmake | 14 -------------- components/esp_common/project_include.cmake | 6 ++++++ components/xtensa/project_include.cmake | 5 +++++ 3 files changed, 11 insertions(+), 14 deletions(-) create mode 100644 components/esp_common/project_include.cmake create mode 100644 components/xtensa/project_include.cmake diff --git a/components/esp32/project_include.cmake b/components/esp32/project_include.cmake index 91c0f8af46..2aab0a53fc 100644 --- a/components/esp32/project_include.cmake +++ b/components/esp32/project_include.cmake @@ -15,17 +15,3 @@ if(CONFIG_SPIRAM_CACHE_WORKAROUND) idf_build_set_property(COMPILE_OPTIONS "-mfix-esp32-psram-cache-strategy=nops" APPEND) endif() endif() - -# Check toolchain is configured properly in cmake -if(NOT ( ${CMAKE_SYSTEM_NAME} STREQUAL "Generic" AND ${CMAKE_C_COMPILER} MATCHES xtensa)) - message(FATAL_ERROR "Internal error, toolchain has not been set correctly by project " - "(or an invalid CMakeCache.txt file has been generated somehow)") -endif() - -# -# Warn if the toolchain version doesn't match -# -# TODO: make these platform-specific for diff toolchains -get_expected_ctng_version(expected_toolchain expected_gcc) -gcc_version_check("${expected_gcc}") -crosstool_version_check("${expected_toolchain}") diff --git a/components/esp_common/project_include.cmake b/components/esp_common/project_include.cmake new file mode 100644 index 0000000000..9c65a5a9ea --- /dev/null +++ b/components/esp_common/project_include.cmake @@ -0,0 +1,6 @@ +# +# Warn if the toolchain version doesn't match +# +get_expected_ctng_version(expected_toolchain expected_gcc) +gcc_version_check("${expected_gcc}") +crosstool_version_check("${expected_toolchain}") diff --git a/components/xtensa/project_include.cmake b/components/xtensa/project_include.cmake new file mode 100644 index 0000000000..c4deb4e984 --- /dev/null +++ b/components/xtensa/project_include.cmake @@ -0,0 +1,5 @@ +# Check toolchain is configured properly in cmake +if(NOT ( ${CMAKE_SYSTEM_NAME} STREQUAL "Generic" AND ${CMAKE_C_COMPILER} MATCHES xtensa)) + message(FATAL_ERROR "Internal error, toolchain has not been set correctly by project " + "(or an invalid CMakeCache.txt file has been generated somehow)") +endif()