diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-06 09:51:14 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-10-06 09:51:14 +0300 |
| commit | 70f87038719da6e5b4c6a4784c192f811302c865 (patch) | |
| tree | f2f404bfab72b6b0f280dbc8cc468682ed7a7bd2 | |
| parent | a0aff910b57b0beb41d528253c48472643623385 (diff) | |
| parent | 3a418242dffe93ee34db388727f67eb498ae48ee (diff) | |
| download | mariadb-git-10.3-MDEV-11369.tar.gz | |
Merge 10.3 into 10.3-instant10.3-MDEV-11369
The tree state corresponds to the squashed
commit a4948dafcd7eee65f16d848bdc6562fc49ef8916 in the 10.3 branch.
This branch is preserved for future reference.
| -rw-r--r-- | cmake/os/Linux.cmake | 4 | ||||
| -rw-r--r-- | cmake/plugin.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/os/Linux.cmake b/cmake/os/Linux.cmake index b0680d92a1b..37a9be9a867 100644 --- a/cmake/os/Linux.cmake +++ b/cmake/os/Linux.cmake @@ -34,8 +34,8 @@ ENDFOREACH() # Ensure we have clean build for shared libraries # without unresolved symbols -# Not supported with AddressSanitizer -IF(NOT WITH_ASAN) +# Not supported with AddressSanitizer and ThreadSanitizer +IF(NOT WITH_ASAN AND NOT WITH_TSAN) SET(LINK_FLAG_NO_UNDEFINED "-Wl,--no-undefined") ENDIF() diff --git a/cmake/plugin.cmake b/cmake/plugin.cmake index 2a2f206dcef..1c4394d11d2 100644 --- a/cmake/plugin.cmake +++ b/cmake/plugin.cmake @@ -208,7 +208,7 @@ MACRO(MYSQL_ADD_PLUGIN) ELSEIF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") TARGET_LINK_LIBRARIES (${target} mysqld) ENDIF() - ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT WITH_ASAN) + ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT WITH_ASAN AND NOT WITH_TSAN) TARGET_LINK_LIBRARIES (${target} "-Wl,--no-undefined") ENDIF() |