Merge branch 'bugfix/linux_target_component_dep' into 'master'

build system: add 'linux' component to common requirements See merge request espressif/esp-idf!19663
espressif · Aug 23, 2022 · d5b80e6 · d5b80e6
2 parents fec97b6 + d5973b8
commit d5b80e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/components/spi_flash/CMakeLists.txt b/components/spi_flash/CMakeLists.txt
@@ -8,7 +8,7 @@ if(${target} STREQUAL "linux")
     idf_component_register(SRCS "${srcs}"
         INCLUDE_DIRS include ${hal_dir}/include ${bootloader_support_dir}/include
         PRIV_INCLUDE_DIRS include/spi_flash
-        PRIV_REQUIRES linux partition_table)
+        PRIV_REQUIRES partition_table)
     return()
 endif()
 

diff --git a/tools/cmake/build.cmake b/tools/cmake/build.cmake
@@ -206,7 +206,7 @@ function(__build_init idf_path)
     endforeach()
 
     if("${target}" STREQUAL "linux")
-        set(requires_common freertos log esp_rom esp_common)
+        set(requires_common freertos log esp_rom esp_common linux)
         idf_build_set_property(__COMPONENT_REQUIRES_COMMON "${requires_common}")
     else()
         # Set components required by all other components in the build