diff options
| -rw-r--r-- | cmake/config-ix.cmake | 1 | ||||
| -rw-r--r-- | lib/asan/tests/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | lib/sanitizer_common/tests/CMakeLists.txt | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index ea89a997c..9902b44f1 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -45,7 +45,6 @@ check_cxx_compiler_flag(/wd4722 COMPILER_RT_HAS_WD4722_FLAG) check_symbol_exists(__func__ "" COMPILER_RT_HAS_FUNC_SYMBOL) # Libraries. -check_library_exists(stdc++ __cxa_pure_virtual "" COMPILER_RT_HAS_LIBSTDCXX) check_library_exists(m pow "" COMPILER_RT_HAS_LIBM) check_library_exists(dl dlopen "" COMPILER_RT_HAS_LIBDL) check_library_exists(pthread pthread_create "" COMPILER_RT_HAS_LIBPTHREAD) diff --git a/lib/asan/tests/CMakeLists.txt b/lib/asan/tests/CMakeLists.txt index 2e4caa4b8..331f38fed 100644 --- a/lib/asan/tests/CMakeLists.txt +++ b/lib/asan/tests/CMakeLists.txt @@ -62,9 +62,6 @@ set(ASAN_UNITTEST_INSTRUMENTED_CFLAGS "-fsanitize-blacklist=${ASAN_BLACKLIST_FILE}" ) -# Unit tests require libstdc++ on POSIX. -append_if(COMPILER_RT_HAS_LIBSTDCXX -lstdc++ ASAN_UNITTEST_COMMON_LINKFLAGS) - if(NOT MSVC) list(APPEND ASAN_UNITTEST_COMMON_LINKFLAGS --driver-mode=g++) endif() diff --git a/lib/sanitizer_common/tests/CMakeLists.txt b/lib/sanitizer_common/tests/CMakeLists.txt index 029319789..331117b24 100644 --- a/lib/sanitizer_common/tests/CMakeLists.txt +++ b/lib/sanitizer_common/tests/CMakeLists.txt @@ -65,7 +65,10 @@ if(MSVC) -Wno-undefined-inline) endif() -append_if(COMPILER_RT_HAS_LIBSTDCXX -lstdc++ SANITIZER_TEST_LINK_FLAGS_COMMON) +if(NOT MSVC) + list(APPEND SANITIZER_TEST_LINK_FLAGS_COMMON --driver-mode=g++) +endif() + append_if(COMPILER_RT_HAS_LIBDL -ldl SANITIZER_TEST_LINK_FLAGS_COMMON) append_if(COMPILER_RT_HAS_LIBPTHREAD -lpthread SANITIZER_TEST_LINK_FLAGS_COMMON) # x86_64 FreeBSD 9.2 additionally requires libc++ to build the tests. |