alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-09-30 19:19:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/cxx_rtti_preparation_v3' into 'master'

Browse Source 
C++:  re-add provisions for optional RTTI support (v3)

See merge request espressif/esp-idf!6556
This commit is contained in:
Ivan Grokhotkov
2019-10-31 23:26:44 +08:00
parent e24dda5dfb c45fdf754f
commit daa9955e4a
6 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/esp32/CMakeLists.txt
View File

@@ -62,11 +62,6 @@ else()
target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32.extram.bss.ld")
endif()
if(NOT CONFIG_COMPILER_CXX_RTTI)
# This has to be linked before esp32.project.ld
target_linker_script(${COMPONENT_LIB} INTERFACE "ld/esp32.discard-rtti.ld")
endif()
# Process the template file through the linker script generation mechanism, and use the output for linking the
# final binary
target_linker_script(${COMPONENT_LIB} INTERFACE "${CMAKE_CURRENT_LIST_DIR}/ld/esp32.project.ld.in"