diff options
| author | Kuba Brecka <kuba.brecka@gmail.com> | 2015-12-04 14:29:11 +0000 |
|---|---|---|
| committer | Kuba Brecka <kuba.brecka@gmail.com> | 2015-12-04 14:29:11 +0000 |
| commit | 87cd9c63df367156e4248cafd388c3edb62d3a52 (patch) | |
| tree | b01236da67778c2641501f93072accb11e50ca55 | |
| parent | 6d73750b2a6e379be0d105429077457fa0b68404 (diff) | |
| download | bcm5719-llvm-87cd9c63df367156e4248cafd388c3edb62d3a52.tar.gz bcm5719-llvm-87cd9c63df367156e4248cafd388c3edb62d3a52.zip | |
[tsan] Enable building and testing TSan Go runtime on OS X
The build and test actually work now, so let's just enable them.
Differential Revision: http://reviews.llvm.org/D15184
llvm-svn: 254716
| -rw-r--r-- | compiler-rt/lib/tsan/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | compiler-rt/test/tsan/CMakeLists.txt | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/compiler-rt/lib/tsan/CMakeLists.txt b/compiler-rt/lib/tsan/CMakeLists.txt index 2594ab10aa1..5830fdda218 100644 --- a/compiler-rt/lib/tsan/CMakeLists.txt +++ b/compiler-rt/lib/tsan/CMakeLists.txt @@ -114,6 +114,16 @@ if(APPLE) ARCHS ${TSAN_SUPPORTED_ARCH} SOURCES ${TSAN_SOURCES} ${TSAN_CXX_SOURCES} ${TSAN_ASM_SOURCES} CFLAGS ${TSAN_RTL_CFLAGS}) + + # Build and check Go runtime. + set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/go/buildgo.sh) + add_custom_target(GotsanRuntimeCheck + COMMAND env "CC=${CMAKE_C_COMPILER} ${OSX_SYSROOT_FLAG}" + IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT} + DEPENDS tsan ${BUILDGO_SCRIPT} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/go + COMMENT "Checking TSan Go runtime..." + VERBATIM) else() foreach(arch ${TSAN_SUPPORTED_ARCH}) if(arch STREQUAL "x86_64") diff --git a/compiler-rt/test/tsan/CMakeLists.txt b/compiler-rt/test/tsan/CMakeLists.txt index ec62acb620a..d4fed1d164a 100644 --- a/compiler-rt/test/tsan/CMakeLists.txt +++ b/compiler-rt/test/tsan/CMakeLists.txt @@ -1,5 +1,5 @@ set(TSAN_TEST_DEPS ${SANITIZER_COMMON_LIT_TEST_DEPS}) -if(NOT ${COMPILER_RT_DEFAULT_TARGET_ARCH} MATCHES "mips" AND NOT APPLE) +if(NOT ${COMPILER_RT_DEFAULT_TARGET_ARCH} MATCHES "mips") list(APPEND TSAN_TEST_DEPS GotsanRuntimeCheck) endif() if(NOT COMPILER_RT_STANDALONE_BUILD) |
