blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 01:29:21 -04:00
Code Issues Projects Releases Wiki Activity

cmake: fix the linker type check for --whole-archive option

Browse Source 
Checking that the host is macOS is not sufficient here, since the
linker is still a GNU linker when cross-compiling for a chip.
Instead, use the linker_type variable introduced in the previous
commit.
This commit is contained in:
Ivan Grokhotkov 2022-11-21 13:08:05 +01:00
parent b47155a70b
commit 7a298f98ae
No known key found for this signature in database
GPG Key ID: 1E050E141B280628
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/cmake/project.cmake
View File

@ -525,17 +525,17 @@ macro(project project_name)
__component_get_target(build_component_target ${build_component}) __component_get_target(build_component_target ${build_component})
__component_get_property(whole_archive ${build_component_target} WHOLE_ARCHIVE) __component_get_property(whole_archive ${build_component_target} WHOLE_ARCHIVE)
if(whole_archive) if(whole_archive)
if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") if(linker_type STREQUAL "GNU")
message(STATUS "Component ${build_component} will be linked with -Wl,-force_load")
target_link_libraries(${project_elf} PRIVATE
"-Wl,-force_load"
${build_component})
else()
message(STATUS "Component ${build_component} will be linked with -Wl,--whole-archive") message(STATUS "Component ${build_component} will be linked with -Wl,--whole-archive")
target_link_libraries(${project_elf} PRIVATE target_link_libraries(${project_elf} PRIVATE
"-Wl,--whole-archive" "-Wl,--whole-archive"
${build_component} ${build_component}
"-Wl,--no-whole-archive") "-Wl,--no-whole-archive")
elseif(linker_type STREQUAL "Darwin")
message(STATUS "Component ${build_component} will be linked with -Wl,-force_load")
target_link_libraries(${project_elf} PRIVATE
"-Wl,-force_load"
${build_component})
endif() endif()
else() else()
target_link_libraries(${project_elf} PRIVATE ${build_component}) target_link_libraries(${project_elf} PRIVATE ${build_component})