espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-07 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/cmake_compiler_warn_write_string' into 'master'

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

See merge request espressif/esp-idf!13852
This commit is contained in:
Angus Gratton
2021-06-10 23:53:44 +00:00
parent a09e413fb6 26f9d2d5e1
commit f5f90abc95
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

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

2
components/esp_hw_support/port/esp32s3/rtc_init.c
View File

@@ -27,7 +27,7 @@
#define RTC_CNTL_MEM_FORCE_NOISO (RTC_CNTL_SLOWMEM_FORCE_NOISO | RTC_CNTL_FASTMEM_FORCE_NOISO) #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) void rtc_init(rtc_config_t cfg)
{ {

2
components/wpa_supplicant/CMakeLists.txt
View File

@@ -157,7 +157,7 @@ idf_component_register(SRCS "${srcs}" "${tls_src}" "${roaming_src}" "${crypto_sr
PRIV_INCLUDE_DIRS src src/utils PRIV_INCLUDE_DIRS src src/utils
PRIV_REQUIRES mbedtls esp_timer) 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 target_compile_definitions(${COMPONENT_LIB} PRIVATE
__ets__ __ets__
ESP_SUPPLICANT ESP_SUPPLICANT