espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/fix-gcc13-dirent-breaking_v5.3' into 'release/v5.3'

Browse Source 
fix(newlib): fix include sys/dirent.h breaking change (v5.3)

See merge request espressif/esp-idf!32528
This commit is contained in:
Ivan Grokhotkov
2024-08-02 16:26:05 +08:00
parent fc847a0e9f 86484c14e6
commit adb5d60ec9
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/newlib/CMakeLists.txt
View File

@ -5,9 +5,6 @@ if(${target} STREQUAL "linux")
endif() endif()
set(include_dirs "platform_include") set(include_dirs "platform_include")
if(CMAKE_C_COMPILER_ID MATCHES "Clang") # TODO LLVM-330
list(APPEND include_dirs "clang_include")
endif()
if(BOOTLOADER_BUILD) if(BOOTLOADER_BUILD)
# Bootloader builds need the platform_include directory (for assert.h), but nothing else # Bootloader builds need the platform_include directory (for assert.h), but nothing else

7
components/newlib/clang_include/sys/dirent.h → components/newlib/platform_include/sys/dirent.h
View File

@ -3,7 +3,7 @@
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#ifdef __clang__ // TODO LLVM-330
#pragma once #pragma once
#include <stddef.h> #include <stddef.h>
@ -63,3 +63,8 @@ int alphasort(const struct dirent **d1, const struct dirent **d2);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#else // __clang__ TODO: IDF-10675
#include_next <sys/dirent.h>
#include <dirent.h>
#endif // __clang__