diff options
author | Kostya Kortchinsky <kostyak@google.com> | 2018-04-16 18:17:22 +0000 |
---|---|---|
committer | Kostya Kortchinsky <kostyak@google.com> | 2018-04-16 18:17:22 +0000 |
commit | 3a550c65971799a04f3b9eed9a41bdb923a5d1ec (patch) | |
tree | 7787ae6e500d28b71f9562ae760536e005b74ff3 | |
parent | 0402fa0fb8b69d9a14568bdac14cedf5c6d238ef (diff) |
[sanitizer] Fix OSX build failure post D45457
Summary:
It looks like OSX's UBSan needs a "NoHooks" version of
`RTSanitizerCommonSymbolizer` to work build properly.
Subscribers: kubamracek, mgorny, delcypher, llvm-commits, #sanitizers
Differential Revision: https://reviews.llvm.org/D45696
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@330146 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/sanitizer_common/CMakeLists.txt | 6 | ||||
-rw-r--r-- | lib/ubsan/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/sanitizer_common/CMakeLists.txt b/lib/sanitizer_common/CMakeLists.txt index e37fe1b18..949b55a67 100644 --- a/lib/sanitizer_common/CMakeLists.txt +++ b/lib/sanitizer_common/CMakeLists.txt @@ -241,6 +241,12 @@ add_compiler_rt_object_libraries(RTSanitizerCommonLibcNoHooks SOURCES ${SANITIZER_LIBCDEP_SOURCES} CFLAGS ${SANITIZER_NO_WEAK_HOOKS_CFLAGS} DEFS ${SANITIZER_COMMON_DEFINITIONS}) +add_compiler_rt_object_libraries(RTSanitizerCommonSymbolizerNoHooks + ${OS_OPTION} + ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH} + SOURCES ${SANITIZER_SYMBOLIZER_SOURCES} + CFLAGS ${SANITIZER_NO_WEAK_HOOKS_CFLAGS} + DEFS ${SANITIZER_COMMON_DEFINITIONS}) if(OS_NAME MATCHES "SunOS") # Solaris ld doesn't support the non-standard GNU ld extension of adding diff --git a/lib/ubsan/CMakeLists.txt b/lib/ubsan/CMakeLists.txt index 5e5eb7dca..183f3ff56 100644 --- a/lib/ubsan/CMakeLists.txt +++ b/lib/ubsan/CMakeLists.txt @@ -91,7 +91,7 @@ if(APPLE) RTSanitizerCommonNoHooks RTSanitizerCommonLibcNoHooks RTSanitizerCommonCoverage - RTSanitizerCommonSymbolizer + RTSanitizerCommonSymbolizerNoHooks RTInterception LINK_FLAGS ${WEAK_SYMBOL_LINK_FLAGS} PARENT_TARGET ubsan) |