Try fix build on MSYS2 using Clang in CLANG64 environment (GH #1241)

More Clang troubles...
This commit is contained in:
Jeffrey Walton 2023-10-06 00:46:30 -04:00
parent 0432085157
commit 19f0e3aa1e
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 3 additions and 1 deletions

View File

@ -203,7 +203,7 @@
/// <tt>_MSC_VER</tt> nor <tt>__BORLANDC__</tt> are defined. /// <tt>_MSC_VER</tt> nor <tt>__BORLANDC__</tt> are defined.
#define CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY ... #define CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY ...
#elif defined(CRYPTOPP_MSC_VERSION) || defined(__BORLANDC__) || \ #elif defined(CRYPTOPP_MSC_VERSION) || defined(__BORLANDC__) || \
(defined(CRYPTOPP_WIN32_AVAILABLE) && defined(CRYPTOPP_LLVM_CLANG_VERSION)) defined(CRYPTOPP_MSVC_CLANG_VERSION)
#define CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY 1 #define CRYPTOPP_MS_STYLE_INLINE_ASSEMBLY 1
#else #else
#define CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY 1 #define CRYPTOPP_GNU_STYLE_INLINE_ASSEMBLY 1

View File

@ -58,6 +58,8 @@
// LLVM Clang version 3.7. Also see https://gist.github.com/yamaya/2924292 // LLVM Clang version 3.7. Also see https://gist.github.com/yamaya/2924292
#if defined(__clang__) && defined(__apple_build_version__) #if defined(__clang__) && defined(__apple_build_version__)
# define CRYPTOPP_APPLE_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) # define CRYPTOPP_APPLE_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
#elif defined(__clang__) && defined(_MSC_VER)
# define CRYPTOPP_MSVC_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
#elif defined(__clang__) #elif defined(__clang__)
# define CRYPTOPP_LLVM_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) # define CRYPTOPP_LLVM_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__)
#endif #endif