Merge branch 'v1.2/cherry-pick-30763' into 'v1.2-branch'

[cherry-pick][ESP32] Fix adding NDEBUG flag to CPPFLAGS (project-chip#30763) into v1.2 See merge request espressif/connectedhomeip!11
espressif · Mar 28, 2024 · 4561c2c · 4561c2c
2 parents c44292f + f03e897
commit 4561c2c
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/config/esp32/components/chip/CMakeLists.txt b/config/esp32/components/chip/CMakeLists.txt
@@ -38,12 +38,9 @@ if(NOT "${IDF_TARGET}" STREQUAL "esp32h2")
 endif()
 
 if (NOT CMAKE_BUILD_EARLY_EXPANSION)
-    if (CONFIG_COMPILER_OPTIMIZATION_DEFAULT OR CONFIG_COMPILER_OPTIMIZATION_NONE)
+    if (CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE)
         set(is_debug TRUE)
     else()
-        if (NOT CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE)
-            message(FATAL_ERROR "CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE shall be set")
-        endif()
         set(is_debug FALSE)
     endif()
 endif()