فهرست منبع

esp32: move toolchain check

Renz Bagaporo 5 سال پیش
والد
کامیت
daa13b3f62
3فایلهای تغییر یافته به همراه11 افزوده شده و 14 حذف شده
  1. 0 14
      components/esp32/project_include.cmake
  2. 6 0
      components/esp_common/project_include.cmake
  3. 5 0
      components/xtensa/project_include.cmake

+ 0 - 14
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}")

+ 6 - 0
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}")

+ 5 - 0
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()