Index: lib/asan/tests/CMakeLists.txt
===================================================================
--- lib/asan/tests/CMakeLists.txt
+++ lib/asan/tests/CMakeLists.txt
@@ -202,9 +202,9 @@
     else()
 
       # Otherwise, reuse ASAN_INST_TEST_OBJECTS.
-      add_compiler_rt_test(AsanDynamicUnitTests "${dynamic_test_name}" "${arch}"
+      generate_asan_tests(ASAN_INST_TEST_OBJECTS
+        AsanDynamicUnitTests "${dynamic_test_name}"
         SUBDIR "dynamic"
-        OBJECTS ${ASAN_INST_TEST_OBJECTS}
         DEPS gtest asan ${ASAN_INST_TEST_OBJECTS}
         LINK_FLAGS ${ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINK_FLAGS}
         )