Skip to content

Commit 5e61895

Browse files
committed
Fix: add -Wno-attributes for ESP-IDF 6.0.1 (PlatformIO 7.0.x)
ESP-IDF 6.0.1 defines __noreturn [[noreturn]] in hal/assert.h when CONFIG_LIBC_PICOLIBC is enabled. The [[noreturn]] type attribute is a C++23 feature and triggers -Werror=attributes on void return types. Fix: add -Wno-attributes to all *_idf_V7_0_1 environments via version_specific_extra in build_matrix.yaml. Also adds version_specific_extra support to the generator script.
1 parent 19b8cb2 commit 5e61895

3 files changed

Lines changed: 29 additions & 6 deletions

File tree

‎extras/ci/build_matrix.yaml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,9 @@ versioned_environments:
263263
template: esp32_idf
264264
build_flags_extra: ["-DCONFIG_RMT_ENABLE_DEBUG_LOG=5"]
265265
versions: ["7.1.2", "7.0.1", "6.13.0", "6.12.0", "6.11.0", "6.10.0", "6.9.0", "6.8.1", "6.7.0"]
266+
version_specific_extra:
267+
"7.0.1":
268+
build_src_flags_extra: ["-Wno-attributes"]
266269

267270
esp32_idf_old:
268271
prefix: esp32_idf
@@ -273,26 +276,41 @@ versioned_environments:
273276
prefix: esp32c3_idf
274277
template: esp32c3_idf
275278
versions: ["7.1.2", "7.0.1", "6.13.0", "6.12.0", "6.11.0", "6.10.0", "6.9.0", "6.8.1", "5.3.0"]
279+
version_specific_extra:
280+
"7.0.1":
281+
build_src_flags_extra: ["-Wno-attributes"]
276282

277283
esp32s2_idf:
278284
prefix: esp32s2_idf
279285
template: esp32s2_idf
280286
versions: ["7.1.2", "7.0.1", "6.13.0", "6.12.0", "6.11.0", "6.10.0", "6.9.0", "6.8.1", "5.3.0"]
287+
version_specific_extra:
288+
"7.0.1":
289+
build_src_flags_extra: ["-Wno-attributes"]
281290

282291
esp32s3_idf:
283292
prefix: esp32s3_idf
284293
template: esp32s3_idf
285294
versions: ["7.1.2", "7.0.1", "6.13.0", "6.12.0", "6.11.0", "6.10.0", "6.9.0", "6.8.1", "5.3.0"]
295+
version_specific_extra:
296+
"7.0.1":
297+
build_src_flags_extra: ["-Wno-attributes"]
286298

287299
esp32c6_idf:
288300
prefix: esp32c6_idf
289301
template: esp32c6_idf
290302
versions: ["7.1.2", "7.0.1", "6.13.0", "6.12.0", "6.11.0", "6.10.0", "6.9.0", "6.8.1"]
303+
version_specific_extra:
304+
"7.0.1":
305+
build_src_flags_extra: ["-Wno-attributes"]
291306

292307
esp32h2_idf:
293308
prefix: esp32h2_idf
294309
template: esp32h2_idf
295310
versions: ["7.1.2", "7.0.1", "6.13.0", "6.12.0", "6.11.0", "6.10.0", "6.9.0", "6.8.1"]
311+
version_specific_extra:
312+
"7.0.1":
313+
build_src_flags_extra: ["-Wno-attributes"]
296314

297315
# Classic ESP32 hardware tests (extras/tests/esp32_hw_based).
298316
# Env names must exist in environments / versioned_environments above.

‎extras/ci/platformio.ini‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -614,7 +614,7 @@ platform = espressif32 @ 7.0.1
614614
board = esp32dev
615615
framework = espidf
616616
build_flags = -DCONFIG_RMT_ENABLE_DEBUG_LOG=5
617-
build_src_flags = -Werror -Wall -Wextra
617+
build_src_flags = -Werror -Wall -Wextra -Wno-attributes
618618
board_build.f_cpu = 240000000L
619619
lib_extra_dirs = .
620620

@@ -725,7 +725,7 @@ lib_extra_dirs = .
725725
platform = espressif32 @ 7.0.1
726726
board = esp32-c3-devkitm-1
727727
framework = espidf
728-
build_src_flags = -Werror -Wall -Wextra
728+
build_src_flags = -Werror -Wall -Wextra -Wno-attributes
729729
board_build.f_cpu = 240000000L
730730
lib_extra_dirs = .
731731

@@ -797,7 +797,7 @@ lib_extra_dirs = .
797797
platform = espressif32 @ 7.0.1
798798
board = esp32-s2-saola-1
799799
framework = espidf
800-
build_src_flags = -Werror -Wall -Wextra
800+
build_src_flags = -Werror -Wall -Wextra -Wno-attributes
801801
board_build.f_cpu = 240000000L
802802
lib_extra_dirs = .
803803

@@ -869,7 +869,7 @@ lib_extra_dirs = .
869869
platform = espressif32 @ 7.0.1
870870
board = esp32-s3-devkitc-1
871871
framework = espidf
872-
build_src_flags = -Werror -Wall -Wextra
872+
build_src_flags = -Werror -Wall -Wextra -Wno-attributes
873873
board_build.f_cpu = 240000000L
874874
lib_extra_dirs = .
875875

@@ -941,7 +941,7 @@ lib_extra_dirs = .
941941
platform = espressif32 @ 7.0.1
942942
board = esp32-c6-devkitm-1
943943
framework = espidf
944-
build_src_flags = -Werror -Wall -Wextra
944+
build_src_flags = -Werror -Wall -Wextra -Wno-attributes
945945
board_build.f_cpu = 240000000L
946946
lib_extra_dirs = .
947947

@@ -1005,7 +1005,7 @@ lib_extra_dirs = .
10051005
platform = espressif32 @ 7.0.1
10061006
board = esp32-h2-devkitm-1
10071007
framework = espidf
1008-
build_src_flags = -Werror -Wall -Wextra
1008+
build_src_flags = -Werror -Wall -Wextra -Wno-attributes
10091009
board_build.f_cpu = 240000000L
10101010
lib_extra_dirs = .
10111011

‎extras/scripts/generate_build_configs.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,15 @@ def expand_versioned_environments(data: dict[str, Any]) -> dict[str, Any]:
7575

7676
name_prefix = group_config.get("prefix", group_name)
7777

78+
version_specific_extra = group_config.get("version_specific_extra", {})
79+
7880
for version in group_config.get("versions", []):
7981
env_name = f"{name_prefix}{version_to_suffix(version)}"
8082
env_config = dict(base_config)
8183
env_config["platform_version"] = version
84+
# Merge version-specific overrides (e.g. version-specific build flags)
85+
if version in version_specific_extra:
86+
env_config.update(version_specific_extra[version])
8287
environments[env_name] = env_config
8388

8489
return environments

0 commit comments

Comments
 (0)