diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-13 23:49:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-13 23:49:10 +0400 |
| commit | c1599821a55ac4f59c5c799480a07913e1c26daa (patch) | |
| tree | 0c064252ad3959fcd53b0f06a40b98d691fe070e /extra | |
| parent | 624dd71b9419555eca8baadc695e3376de72286f (diff) | |
| parent | c4fd167d5a740f67ee5287a9b05b5383403b9ed0 (diff) | |
| download | mariadb-git-c1599821a55ac4f59c5c799480a07913e1c26daa.tar.gz | |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/wolfssl/CMakeLists.txt | 4 | ||||
| m--------- | extra/wolfssl/wolfssl | 0 |
2 files changed, 0 insertions, 4 deletions
diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index 2cb3f1dd3d1..7eefa840bfa 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -40,10 +40,6 @@ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/wolfssl) IF(MSVC) # size_t to long truncation warning SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -wd4267 -wd4334") - IF(CMAKE_C_COMPILER_ID MATCHES Clang) - # Workaround a bug with clang-cl, see https://github.com/wolfSSL/wolfssl/pull/2090 - ADD_DEFINITIONS(-DMP_16BIT) - ENDIF() ENDIF() ADD_CONVENIENCE_LIBRARY(wolfssl ${WOLFSSL_SOURCES}) diff --git a/extra/wolfssl/wolfssl b/extra/wolfssl/wolfssl -Subproject 21f2beca9f320199fcea4a96df3e19967804144 +Subproject 50fbdb961fd8c2d8123064e567ae8ec44167732 |