Просмотр исходного кода

Merge branch 'bugfix/cmake_compiler_warn_write_string' into 'master'

Build: Fix CMake to pass -Wwrite-string compiler flag if enabled

See merge request espressif/esp-idf!13852
Angus Gratton 4 лет назад
Родитель
Сommit
f5f90abc95

+ 4 - 0
CMakeLists.txt

@@ -74,6 +74,10 @@ if(CONFIG_COMPILER_DISABLE_GCC8_WARNINGS)
                                 "-Wno-int-in-bool-context")
 endif()
 
+if(CONFIG_COMPILER_WARN_WRITE_STRINGS)
+    list(APPEND compile_options "-Wwrite-strings")
+endif()
+
 if(CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE)
     list(APPEND compile_definitions "-DNDEBUG")
 endif()

+ 1 - 1
components/esp_hw_support/port/esp32s3/rtc_init.c

@@ -27,7 +27,7 @@
 
 #define RTC_CNTL_MEM_FORCE_NOISO (RTC_CNTL_SLOWMEM_FORCE_NOISO | RTC_CNTL_FASTMEM_FORCE_NOISO)
 
-static char *TAG = "rtcinit";
+static const char *TAG = "rtcinit";
 
 void rtc_init(rtc_config_t cfg)
 {

+ 1 - 1
components/wpa_supplicant/CMakeLists.txt

@@ -157,7 +157,7 @@ idf_component_register(SRCS "${srcs}" "${tls_src}" "${roaming_src}" "${crypto_sr
                     PRIV_INCLUDE_DIRS src src/utils
                     PRIV_REQUIRES mbedtls esp_timer)
 
-target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-strict-aliasing)
+target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-strict-aliasing -Wno-write-strings)
 target_compile_definitions(${COMPONENT_LIB} PRIVATE
     __ets__
     ESP_SUPPLICANT