alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

build: fixed unwanted libgcc when building using clang for linux target

Browse Source
This commit is contained in:
radek.tandler 2023-06-14 16:40:04 +02:00
parent 6f4ee07b69
commit 58d6216956
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -224,11 +224,10 @@ endif()
if(CMAKE_C_COMPILER_ID MATCHES "Clang") if(CMAKE_C_COMPILER_ID MATCHES "Clang")
list(APPEND compile_options "-fno-use-cxa-atexit") list(APPEND compile_options "-fno-use-cxa-atexit")
if(CONFIG_COMPILER_RT_LIB_GCCLIB) endif()
list(APPEND link_options "-rtlib=libgcc")
elseif(CONFIG_COMPILER_RT_LIB_CLANGRT) if(COMPILER_RT_LIB_NAME)
list(APPEND link_options "-rtlib=compiler-rt") list(APPEND link_options "-rtlib=${CONFIG_COMPILER_RT_LIB_NAME}")
endif()
endif() endif()
# For the transition period from 32-bit time_t to 64-bit time_t, # For the transition period from 32-bit time_t to 64-bit time_t,

9
Kconfig
View File

@ -514,23 +514,30 @@ mainmenu "Espressif IoT Development Framework Configuration"
choice COMPILER_RT_LIB choice COMPILER_RT_LIB
prompt "Compiler runtime library" prompt "Compiler runtime library"
default COMPILER_RT_LIB_CLANGRT if IDF_TOOLCHAIN_CLANG default COMPILER_RT_LIB_CLANGRT if IDF_TOOLCHAIN_CLANG
default COMPILER_RT_LIB_HOST if IDF_TARGET_LINUX
default COMPILER_RT_LIB_GCCLIB default COMPILER_RT_LIB_GCCLIB
help help
Select runtime library to be used by compiler. Select runtime library to be used by compiler.
- GCC toolchain supports libgcc only. - GCC toolchain supports libgcc only.
- Clang allows to choose between libgcc or libclang_rt. - Clang allows to choose between libgcc or libclang_rt.
- For host builds ("linux" target), uses the default library.
config COMPILER_RT_LIB_GCCLIB config COMPILER_RT_LIB_GCCLIB
depends on !IDF_TARGET_LINUX
bool "libgcc" bool "libgcc"
config COMPILER_RT_LIB_CLANGRT config COMPILER_RT_LIB_CLANGRT
depends on IDF_TOOLCHAIN_CLANG depends on IDF_TOOLCHAIN_CLANG && !IDF_TARGET_LINUX
bool "libclang_rt" bool "libclang_rt"
config COMPILER_RT_LIB_HOST
depends on IDF_TARGET_LINUX
bool "Host"
endchoice endchoice
config COMPILER_RT_LIB_NAME config COMPILER_RT_LIB_NAME
string string
default "clang_rt.builtins" if COMPILER_RT_LIB_CLANGRT default "clang_rt.builtins" if COMPILER_RT_LIB_CLANGRT
default "gcc" if COMPILER_RT_LIB_GCCLIB default "gcc" if COMPILER_RT_LIB_GCCLIB
default "" if COMPILER_RT_LIB_HOST
endmenu # Compiler Options endmenu # Compiler Options