kopia lustrzana https://github.com/espressif/esp-idf
Merge branch 'bugfix/make_cxx_depend_on_pthread' into 'master'
cxx: force pthread to appear later in link line See merge request espressif/esp-idf!6124pull/4139/head
commit
363e41eadf
|
@ -1,9 +1,17 @@
|
|||
idf_component_register(SRCS "cxx_exception_stubs.cpp"
|
||||
"cxx_guards.cpp")
|
||||
"cxx_guards.cpp"
|
||||
# Make sure that pthread is in component list
|
||||
PRIV_REQUIRES pthread)
|
||||
|
||||
target_link_libraries(${COMPONENT_LIB} PUBLIC stdc++ gcc)
|
||||
target_link_libraries(${COMPONENT_LIB} INTERFACE "-u __cxa_guard_dummy")
|
||||
|
||||
# Force pthread to also appear later than stdc++ in link line
|
||||
add_library(stdcpp_pthread INTERFACE)
|
||||
idf_component_get_property(pthread pthread COMPONENT_LIB)
|
||||
target_link_libraries(stdcpp_pthread INTERFACE stdc++ $<TARGET_FILE:${pthread}>)
|
||||
target_link_libraries(${COMPONENT_LIB} PUBLIC stdcpp_pthread)
|
||||
|
||||
if(NOT CONFIG_COMPILER_CXX_EXCEPTIONS)
|
||||
target_link_libraries(${COMPONENT_LIB} INTERFACE "-u __cxx_fatal_exception")
|
||||
endif()
|
||||
|
|
Ładowanie…
Reference in New Issue