Skip to content
This repository was archived by the owner on May 21, 2019. It is now read-only.

Commit 861f521

Browse files
committed
Add liblog to ubsan UBSAN_DYNAMIC_LIBS
Summary: liblog is still required to create ubsan runtimes on Android when __ANDROID_API__ < 21. Reviewers: eugenis, vsk Subscribers: kubamracek, mgorny, pirama, srhines, llvm-commits Differential Revision: https://reviews.llvm.org/D35915 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@309180 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 01ebee3 commit 861f521

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lib/ubsan/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ append_rtti_flag(ON UBSAN_CXXFLAGS)
3535
append_list_if(SANITIZER_CAN_USE_CXXABI -DUBSAN_CAN_USE_CXXABI UBSAN_CXXFLAGS)
3636

3737
append_list_if(COMPILER_RT_HAS_LIBDL dl UBSAN_DYNAMIC_LIBS)
38+
append_list_if(COMPILER_RT_HAS_LIBLOG log UBSAN_DYNAMIC_LIBS)
3839
append_list_if(COMPILER_RT_HAS_LIBRT rt UBSAN_DYNAMIC_LIBS)
3940
append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread UBSAN_DYNAMIC_LIBS)
4041

@@ -129,7 +130,7 @@ else()
129130
add_compiler_rt_object_libraries(RTUbsan_standalone
130131
ARCHS ${UBSAN_SUPPORTED_ARCH}
131132
SOURCES ${UBSAN_STANDALONE_SOURCES} CFLAGS ${UBSAN_STANDALONE_CFLAGS})
132-
133+
133134
# Standalone UBSan runtimes.
134135
add_compiler_rt_runtime(clang_rt.ubsan_standalone
135136
STATIC
@@ -140,7 +141,7 @@ else()
140141
RTUbsan_standalone
141142
CFLAGS ${UBSAN_CFLAGS}
142143
PARENT_TARGET ubsan)
143-
144+
144145
add_compiler_rt_runtime(clang_rt.ubsan_standalone_cxx
145146
STATIC
146147
ARCHS ${UBSAN_SUPPORTED_ARCH}

0 commit comments

Comments
 (0)