Change GWP-ASan build to use '-pthread' instead of '-lpthread' in order

to try and fix android buildbot. Also make sure that the empty dummy
test contains an output file name so the android_build.py wrapper script
doesn't check fail.

llvm-svn: 362758

diff --git a/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt b/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt
index f2f72c858619a5fb48c4d5afb4075637e554511c..d87061f72682406c486da6f2a32b950bf7d8b564 100644 (file)
--- a/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt
+++ b/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt
@@ -18,7 +18,7 @@ set_target_properties(GwpAsanUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
 set(GWP_ASAN_UNITTEST_LINK_FLAGS ${COMPILER_RT_UNITTEST_LINK_FLAGS})
 list(APPEND GWP_ASAN_UNITTEST_LINK_FLAGS --driver-mode=g++)
 if(NOT WIN32)
-  list(APPEND GWP_ASAN_UNITTEST_LINK_FLAGS -lpthread)
+  list(APPEND GWP_ASAN_UNITTEST_LINK_FLAGS -pthread)
 endif()
 
 if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST GWP_ASAN_SUPPORTED_ARCH)

diff --git a/compiler-rt/test/gwp_asan/dummy_test.cc b/compiler-rt/test/gwp_asan/dummy_test.cc
index 93e522ab9f0a9875d0c86f2cc65724cb70b8afa3..ff3ff55b16383fdcc2de14524bc8e53463dcd1cb 100644 (file)
--- a/compiler-rt/test/gwp_asan/dummy_test.cc
+++ b/compiler-rt/test/gwp_asan/dummy_test.cc
@@ -1,4 +1,4 @@
 // Exists to simply stop warnings about lit not discovering any tests here.
-// RUN: %clang %s
+// RUN: %clang %s -o %s.o
 
 int main() { return 0; }