[compiler-rt] r190786 - Minor enhancements for sanitizer_common build rules

[Alexey Samsonov]

Author: samsonov
Date: Mon Sep 16 10:43:23 2013
New Revision: 190786

URL: http://llvm.org/viewvc/llvm-project?rev=190786&view=rev
Log:
Minor enhancements for sanitizer_common build rules

Modified:
    compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt
    compiler-rt/trunk/lib/sanitizer_common/tests/CMakeLists.txt

Modified: compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt?rev=190786&r1=190785&r2=190786&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/sanitizer_common/CMakeLists.txt Mon Sep 16 10:43:23 2013
@@ -96,7 +96,8 @@ else()
       SOURCES $<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
               $<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
       CFLAGS ${SANITIZER_CFLAGS})
-    list(APPEND SANITIZER_RUNTIME_LIBRARIES RTSanitizerCommon.${arch})
+    list(APPEND SANITIZER_RUNTIME_LIBRARIES RTSanitizerCommon.${arch}
+                                            RTSanitizerCommonLibc.${arch})
   endforeach()
 endif()
 

Modified: compiler-rt/trunk/lib/sanitizer_common/tests/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/tests/CMakeLists.txt?rev=190786&r1=190785&r2=190786&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/tests/CMakeLists.txt (original)
+++ compiler-rt/trunk/lib/sanitizer_common/tests/CMakeLists.txt Mon Sep 16 10:43:23 2013
@@ -18,10 +18,10 @@ set(SANITIZER_UNITTESTS
   sanitizer_stoptheworld_test.cc
   sanitizer_suppressions_test.cc
   sanitizer_test_main.cc
-  sanitizer_thread_registry_test.cc
-  )
+  sanitizer_thread_registry_test.cc)
 
-set(SANITIZER_TEST_HEADERS)
+set(SANITIZER_TEST_HEADERS
+  sanitizer_test_utils.h)
 foreach(header ${SANITIZER_HEADERS})
   list(APPEND SANITIZER_TEST_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/../${header})
 endforeach()