Skip to content

Commit 0f97d97

Browse files
committed
Merge branch 'bugfix/esp32c6_tools' into 'main'
Bugfix: esp32c6 toolchain not getting listed See merge request app-frameworks/esp-insights!153
2 parents 01bba60 + fc14d43 commit 0f97d97

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

components/esp_insights/project_include.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if(CONFIG_ESP_INSIGHTS_ENABLED)
1010
add_custom_command(
1111
TARGET app
1212
POST_BUILD
13-
COMMAND ${python} ${CMAKE_CURRENT_LIST_DIR}/scripts/get_projbuild_gitconfig.py ${PROJECT_DIR} ${CMAKE_PROJECT_NAME} ${PROJECT_VER} ${build_dir}/${PROJ_BUILD_CONFIG_FILE} ${idf_path} ${target}
13+
COMMAND ${python} ${CMAKE_CURRENT_LIST_DIR}/scripts/get_projbuild_gitconfig.py ${PROJECT_DIR} ${CMAKE_PROJECT_NAME} ${PROJECT_VER} ${build_dir}/${PROJ_BUILD_CONFIG_FILE} ${idf_path} ${_CMAKE_TOOLCHAIN_PREFIX}
1414
COMMAND ${CMAKE_COMMAND}
1515
-D BUILD_DIR=${build_dir}
1616
-D PROJECT_DIR=${PROJECT_DIR}

components/esp_insights/scripts/get_projbuild_gitconfig.py

+4-8
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
FILENAME=sys.argv[4]
2222
# Input IDF_PATH from CMakeLists.txt
2323
IDF_PATH=sys.argv[5]
24-
# Input target
25-
TARGET=sys.argv[6]
24+
# Toolchain Prefix
25+
TOOLCHAIN_PREFIX=sys.argv[6]
2626

2727
NEWLINE = "\n"
2828

@@ -44,7 +44,7 @@ def _set_submodule_cfg(submodules, repo_name):
4444
NAME_STR = "name"
4545
VERSION_STR = "version"
4646
CONFIG[repo_name][CFG_TITLE] = []
47-
47+
4848
if submodules:
4949
# Get the submodule name and version
5050
submodules_list = submodules.strip().split(NEWLINE)
@@ -83,13 +83,9 @@ def set_cfg(config_name):
8383
submodules = run_cmd(SUBMODULE)
8484
_set_submodule_cfg(submodules, repo_name)
8585
elif config_name == "toolchain":
86-
# Set config for Toolchain Version
87-
arch_target = "xtensa-" + TARGET
88-
if TARGET == "esp32c3" or TARGET == "esp32c2" or TARGET == "esp32h2":
89-
arch_target = "riscv32-esp"
9086
# Get toolchain version
9187
TOOLCHAIN_STR = "toolchain"
92-
TOOLCHAIN = arch_target + '-elf-gcc --version'
88+
TOOLCHAIN = TOOLCHAIN_PREFIX + 'gcc --version'
9389
toolchain = run_cmd(TOOLCHAIN)
9490
CONFIG[TOOLCHAIN_STR] = toolchain.strip().split(NEWLINE)[0]
9591

0 commit comments

Comments
 (0)