espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/macos_linker_type' into 'master'

Browse Source 
cmake: fixes related to linker flags

See merge request espressif/esp-idf!21178
This commit is contained in:
Ivan Grokhotkov
2022-11-21 23:37:19 +08:00
parent 74ed2aa2ee 7a298f98ae
commit c837974887
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tools/cmake/project.cmake
View File

@@ -512,21 +512,30 @@ macro(project project_name)
list(REMOVE_ITEM build_components ${test_components}) list(REMOVE_ITEM build_components ${test_components})
endif() endif()
if(CONFIG_IDF_TARGET_LINUX AND CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
# Compiling for the host, and the host is macOS, so the linker is Darwin LD.
# Note, when adding support for Clang and LLD based toolchain this check will
# need to be modified.
set(linker_type "Darwin")
else()
set(linker_type "GNU")
endif()
foreach(build_component ${build_components}) foreach(build_component ${build_components})
__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})
@@ -534,7 +543,7 @@ macro(project project_name)
endforeach() endforeach()
if(CMAKE_C_COMPILER_ID STREQUAL "GNU") if(linker_type STREQUAL "GNU")
set(mapfile "${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.map") set(mapfile "${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.map")
set(idf_target "${IDF_TARGET}") set(idf_target "${IDF_TARGET}")
string(TOUPPER ${idf_target} idf_target) string(TOUPPER ${idf_target} idf_target)