diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2015-08-27 22:23:27 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2015-08-27 22:23:27 +0000 |
| commit | 7eedde663ebef4e9d1d287efd568c9cd7094811f (patch) | |
| tree | e4c74d994bfcd147e6ee4cc2f55f932be45f9bb1 /lib/asan | |
| parent | b980cb13021238b0a6ff304a853c7fb919c297fc (diff) | |
[CMake] Unify build rules for sanitizer_common for Apple and non-Apple platforms.
Additionally, link safestack runtime on OS X with nolibc version of
sanitizer_common runtime, as we do on Linux.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@246227 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/asan')
| -rw-r--r-- | lib/asan/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lib/asan/tests/CMakeLists.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/asan/CMakeLists.txt b/lib/asan/CMakeLists.txt index 3f5f12973..6716f48b2 100644 --- a/lib/asan/CMakeLists.txt +++ b/lib/asan/CMakeLists.txt @@ -113,6 +113,7 @@ if(APPLE) OBJECT_LIBS RTAsan_dynamic RTInterception RTSanitizerCommon + RTSanitizerCommonLibc RTLSanCommon RTUbsan CFLAGS ${ASAN_DYNAMIC_CFLAGS} diff --git a/lib/asan/tests/CMakeLists.txt b/lib/asan/tests/CMakeLists.txt index 58ab1add4..7a8d8f7f1 100644 --- a/lib/asan/tests/CMakeLists.txt +++ b/lib/asan/tests/CMakeLists.txt @@ -220,6 +220,7 @@ macro(add_asan_tests_for_arch_and_kind arch kind) $<TARGET_OBJECTS:RTAsan_dynamic.osx> $<TARGET_OBJECTS:RTInterception.osx> $<TARGET_OBJECTS:RTSanitizerCommon.osx> + $<TARGET_OBJECTS:RTSanitizerCommonLibc.osx> $<TARGET_OBJECTS:RTLSanCommon.osx> $<TARGET_OBJECTS:RTUbsan.osx>) else() |