Skip to content

Commit 447b32f

Browse files
authored
[asan] add the new/delete code back to RTAsan_dynamic (#108329)
the new/delete code was removed from RTAsan_dynamic in #107899, but that broke things on macos. This reverts the offending change.
1 parent e31efd8 commit 447b32f

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

compiler-rt/lib/asan/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ append_list_if(MINGW "${MINGW_LIBRARIES}" ASAN_DYNAMIC_LIBS)
160160
add_compiler_rt_object_libraries(RTAsan_dynamic
161161
OS ${SANITIZER_COMMON_SUPPORTED_OS}
162162
ARCHS ${ASAN_SUPPORTED_ARCH}
163-
SOURCES ${ASAN_SOURCES}
163+
SOURCES ${ASAN_SOURCES} ${ASAN_CXX_SOURCES}
164164
ADDITIONAL_HEADERS ${ASAN_HEADERS}
165165
CFLAGS ${ASAN_DYNAMIC_CFLAGS}
166166
DEFS ${ASAN_DYNAMIC_DEFINITIONS})
@@ -312,7 +312,6 @@ else()
312312
SHARED
313313
ARCHS ${arch}
314314
OBJECT_LIBS ${ASAN_COMMON_RUNTIME_OBJECT_LIBS}
315-
RTAsan_cxx
316315
RTAsan_dynamic
317316
# The only purpose of RTAsan_dynamic_version_script_dummy is to
318317
# carry a dependency of the shared runtime on the version script.

0 commit comments

Comments
 (0)