diff options
| author | Dmitri Gribenko <gribozavr@gmail.com> | 2015-02-22 11:04:59 +0000 |
|---|---|---|
| committer | Dmitri Gribenko <gribozavr@gmail.com> | 2015-02-22 11:04:59 +0000 |
| commit | bc4c42c3458edf7b75c47d3b6303462a1a5b0e4a (patch) | |
| tree | ec6b30793fc791cd332499dc076f2000da39138f | |
| parent | 3d61760bd6b206d46f7f168602b1cb9e45156c7a (diff) | |
| download | bcm5719-llvm-bc4c42c3458edf7b75c47d3b6303462a1a5b0e4a.tar.gz bcm5719-llvm-bc4c42c3458edf7b75c47d3b6303462a1a5b0e4a.zip | |
TSan runtime: unbreak the build with ccache
llvm-svn: 230171
| -rw-r--r-- | compiler-rt/lib/tsan/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | compiler-rt/lib/tsan/go/buildgo.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler-rt/lib/tsan/CMakeLists.txt b/compiler-rt/lib/tsan/CMakeLists.txt index 9f6d63041a6..86db3bcc71f 100644 --- a/compiler-rt/lib/tsan/CMakeLists.txt +++ b/compiler-rt/lib/tsan/CMakeLists.txt @@ -89,7 +89,7 @@ if(UNIX AND NOT APPLE) # Sanity check for Go runtime. set(BUILDGO_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/go/buildgo.sh) add_custom_target(GotsanRuntimeCheck - COMMAND CC=${CMAKE_C_COMPILER} IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT} + COMMAND env "CC=${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1}" IN_TMPDIR=1 SILENT=1 ${BUILDGO_SCRIPT} DEPENDS clang_rt.tsan-${arch} ${BUILDGO_SCRIPT} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/go COMMENT "Checking TSan Go runtime..." diff --git a/compiler-rt/lib/tsan/go/buildgo.sh b/compiler-rt/lib/tsan/go/buildgo.sh index 5ac60349e08..a7dca9c3c28 100755 --- a/compiler-rt/lib/tsan/go/buildgo.sh +++ b/compiler-rt/lib/tsan/go/buildgo.sh @@ -35,7 +35,7 @@ SRCS=" if [ "`uname -a | grep Linux`" != "" ]; then SUFFIX="linux_amd64" - OSCFLAGS="-fPIC -ffreestanding -Wno-maybe-uninitialized -Wno-unused-const-variable -Werror -Wno-unknown-warning-option" + OSCFLAGS="-fPIC -ffreestanding -Wno-maybe-uninitialized -Wno-unused-const-variable -Werror -Wno-unknown-warning-option -Wno-error=unused-command-line-argument" OSLDFLAGS="-lpthread -fPIC -fpie" SRCS=" $SRCS |
