diff options
| author | Petr Hosek <phosek@chromium.org> | 2017-07-31 22:46:43 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2017-07-31 22:46:43 +0000 |
| commit | add8c7766a630d6a21adb1cb26304563f1c728a6 (patch) | |
| tree | d82a3fdbf78d0c0454d910b06323d27de6d15fd2 /CMakeLists.txt | |
| parent | 42a455c34ed860066b92b8957fa9dd786026939d (diff) | |
[sanitizer] Fix the sanitizer build on Android
Android uses libgcc name even for shared library unlike other platforms
which use libgcc_s. Furthemore, Android libstdc++ has a dependency on
libdl. These need to be handled while performing CMake checks.
Differential Revision: https://reviews.llvm.org/D36035
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@309638 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ed3e01d23..294904b50 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -279,7 +279,11 @@ if (SANITIZER_USE_COMPILER_RT) find_compiler_rt_library(builtins COMPILER_RT_BUILTINS_LIBRARY) list(APPEND SANITIZER_COMMON_LINK_LIBS ${COMPILER_RT_BUILTINS_LIBRARY}) else() - append_list_if(COMPILER_RT_HAS_GCC_S_LIB gcc_s SANITIZER_COMMON_LINK_LIBS) + if (ANDROID) + append_list_if(COMPILER_RT_HAS_GCC_LIB gcc SANITIZER_COMMON_LINK_LIBS) + else() + append_list_if(COMPILER_RT_HAS_GCC_S_LIB gcc_s SANITIZER_COMMON_LINK_LIBS) + endif() endif() append_list_if(COMPILER_RT_HAS_LIBC c SANITIZER_COMMON_LINK_LIBS) |