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

cmake: using toolchain prefix determined by cmake itself

Browse Source
This commit is contained in:
morris 2022-01-08 14:06:43 +08:00
parent 03b3cd2f98
commit 1267738149
5 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Kconfig
View File

@ -105,18 +105,6 @@ mainmenu "Espressif IoT Development Framework Configuration"
default 0xFFFF default 0xFFFF
menu "SDK tool configuration" menu "SDK tool configuration"
config SDK_TOOLPREFIX
string "Compiler toolchain path/prefix"
default "xtensa-esp32-elf-" if IDF_TARGET_ESP32
default "xtensa-esp32s2-elf-" if IDF_TARGET_ESP32S2
default "xtensa-esp32s3-elf-" if IDF_TARGET_ESP32S3
default "riscv32-esp-elf-" if IDF_TARGET_ESP32C3
default "riscv32-esp-elf-" if IDF_TARGET_ESP32H2
default "riscv32-esp-elf-" if IDF_TARGET_ESP8684
help
The prefix/path that is used to call the toolchain. The default setting assumes
a crosstool-ng gcc setup that is in your PATH.
config SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS config SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS
bool "Toolchain supports time_t wide 64-bits" bool "Toolchain supports time_t wide 64-bits"

2
components/app_trace/project_include.cmake
View File

@ -2,7 +2,7 @@
# #
# Create coverage report. # Create coverage report.
function(idf_create_coverage_report report_dir) function(idf_create_coverage_report report_dir)
set(gcov_tool ${CONFIG_SDK_TOOLPREFIX}gcov) set(gcov_tool ${_CMAKE_TOOLCHAIN_PREFIX}gcov)
idf_build_get_property(project_name PROJECT_NAME) idf_build_get_property(project_name PROJECT_NAME)
add_custom_target(pre-cov-report add_custom_target(pre-cov-report

3
sdkconfig.rename
View File

@ -1,9 +1,6 @@
# sdkconfig replacement configurations for deprecated options formatted as # sdkconfig replacement configurations for deprecated options formatted as
# CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION # CONFIG_DEPRECATED_OPTION CONFIG_NEW_OPTION
# SDK tool configuration
CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
# Compiler options # Compiler options
CONFIG_OPTIMIZATION_COMPILER CONFIG_COMPILER_OPTIMIZATION CONFIG_OPTIMIZATION_COMPILER CONFIG_COMPILER_OPTIMIZATION
CONFIG_OPTIMIZATION_LEVEL_DEBUG CONFIG_COMPILER_OPTIMIZATION_DEFAULT CONFIG_OPTIMIZATION_LEVEL_DEBUG CONFIG_COMPILER_OPTIMIZATION_DEFAULT

2
tools/cmake/project_description.json.in
View File

@ -11,7 +11,7 @@
"rev": "${CONFIG_ESP32_REV_MIN}", "rev": "${CONFIG_ESP32_REV_MIN}",
"phy_data_partition": "${CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION}", "phy_data_partition": "${CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION}",
"monitor_baud" : "${CONFIG_ESPTOOLPY_MONITOR_BAUD}", "monitor_baud" : "${CONFIG_ESPTOOLPY_MONITOR_BAUD}",
"monitor_toolprefix": "${CONFIG_SDK_TOOLPREFIX}", "monitor_toolprefix": "${_CMAKE_TOOLCHAIN_PREFIX}",
"config_environment" : { "config_environment" : {
"COMPONENT_KCONFIGS" : "${COMPONENT_KCONFIGS}", "COMPONENT_KCONFIGS" : "${COMPONENT_KCONFIGS}",
"COMPONENT_KCONFIGS_PROJBUILD" : "${COMPONENT_KCONFIGS_PROJBUILD}" "COMPONENT_KCONFIGS_PROJBUILD" : "${COMPONENT_KCONFIGS_PROJBUILD}"

2
tools/test_apps/build_system/ldalign_test/CMakeLists.txt
View File

@ -9,7 +9,7 @@ idf_build_get_property(python PYTHON)
idf_build_get_property(elf EXECUTABLE) idf_build_get_property(elf EXECUTABLE)
set(check_alignment "${CMAKE_CURRENT_LIST_DIR}/check_alignment.py") set(check_alignment "${CMAKE_CURRENT_LIST_DIR}/check_alignment.py")
set(readelf "${CMAKE_TOOLCHAIN_PREFIX}readelf") set(readelf "${_CMAKE_TOOLCHAIN_PREFIX}readelf")
add_custom_command( add_custom_command(
TARGET ${elf} TARGET ${elf}