summaryrefslogtreecommitdiffstats
path: root/compiler-rt/lib
diff options
context:
space:
mode:
authorAlexey Samsonov <samsonov@google.com>2013-09-16 15:43:23 +0000
committerAlexey Samsonov <samsonov@google.com>2013-09-16 15:43:23 +0000
commitad7925e0c10622c25f22060967ae5967e7cbb950 (patch)
tree4d856f880938ecf70c33be87d717ffc7f8b46a28 /compiler-rt/lib
parent725ec4e84f19cd696680ae43fa80d6871b3512b0 (diff)
downloadbcm5719-llvm-ad7925e0c10622c25f22060967ae5967e7cbb950.tar.gz
bcm5719-llvm-ad7925e0c10622c25f22060967ae5967e7cbb950.zip
Minor enhancements for sanitizer_common build rules
llvm-svn: 190786
Diffstat (limited to 'compiler-rt/lib')
-rw-r--r--compiler-rt/lib/sanitizer_common/CMakeLists.txt3
-rw-r--r--compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt6
2 files changed, 5 insertions, 4 deletions
diff --git a/compiler-rt/lib/sanitizer_common/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/CMakeLists.txt
index 54760cb4c4f..63c49630c13 100644
--- a/compiler-rt/lib/sanitizer_common/CMakeLists.txt
+++ b/compiler-rt/lib/sanitizer_common/CMakeLists.txt
@@ -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()
diff --git a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
index d7ccc788d11..16858b536ca 100644
--- a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
+++ b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt
@@ -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()
OpenPOWER on IntegriCloud