diff options
author | Antons Jeļkins <Antons.Jelkins@bmw.de> | 2021-11-16 17:34:48 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2021-11-18 14:17:38 (GMT) |
commit | 26c9fbab4618d53f49f92ff3a000951a1d9b9fde (patch) | |
tree | 4105ae4556efc6b57de918413a6b77dfdca86b02 | |
parent | f0eae9292baa9932e6c5eb8d95b7552c291cfeb4 (diff) | |
download | CMake-26c9fbab4618d53f49f92ff3a000951a1d9b9fde.zip CMake-26c9fbab4618d53f49f92ff3a000951a1d9b9fde.tar.gz CMake-26c9fbab4618d53f49f92ff3a000951a1d9b9fde.tar.bz2 |
MINGW-w64: Fix string(TIMESTAMP) build on 32bits.
Rephrase the string(TIMESTAMP) implementation not to
cause gcc-11 ICE on MSYS2/mingw32.
Fixes: #22916
-rw-r--r-- | Source/cmTimestamp.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Source/cmTimestamp.cxx b/Source/cmTimestamp.cxx index 9125d7e..c8f5a4b 100644 --- a/Source/cmTimestamp.cxx +++ b/Source/cmTimestamp.cxx @@ -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 = |