mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 19:00:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

MINGW-w64: Fix string(TIMESTAMP) build on 32bits.

Browse Source 
Rephrase the string(TIMESTAMP) implementation not to
cause gcc-11 ICE on MSYS2/mingw32.

Fixes: #22916
This commit is contained in:
Antons Jeļkins
2021-11-16 18:34:48 +01:00
committed by Brad King
parent f0eae9292b
commit 26c9fbab46
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmTimestamp.cxx
View File

@@ -198,7 +198,7 @@ std::string cmTimestamp::AddTimestampComponent(char flag,
/* See a bug in MinGW: https://sourceforge.net/p/mingw-w64/bugs/793/. A work
* around is to try to use strftime() from ucrtbase.dll. */
using T = size_t(WINAPI*)(char*, size_t, const char*, const struct tm*);
auto loadStrftime = [] {
auto loadUcrtStrftime = []() -> T {
auto handle =
LoadLibraryExA("ucrtbase.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32);
if (handle) {
@@ -207,9 +207,15 @@ std::string cmTimestamp::AddTimestampComponent(char flag,
return reinterpret_cast<T>(GetProcAddress(handle, "strftime"));
# pragma GCC diagnostic pop
}
return strftime;
return nullptr;
};
static T strftime = loadStrftime();
static T ucrtStrftime = loadUcrtStrftime();
if (ucrtStrftime) {
size_t size =
ucrtStrftime(buffer, sizeof(buffer), formatString.c_str(), &timeStruct);
return std::string(buffer, size);
}
#endif
size_t size =