From e41e366ae72741261bfe71ec85cce4e2aed29109 Mon Sep 17 00:00:00 2001 From: Mitch Phillips Date: Thu, 6 Jun 2019 23:43:25 +0000 Subject: [PATCH] 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 --- compiler-rt/lib/gwp_asan/tests/CMakeLists.txt | 2 +- compiler-rt/test/gwp_asan/dummy_test.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt b/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt index f2f72c8..d87061f 100644 --- 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 93e522a..ff3ff55 100644 --- 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; } -- 2.7.4