diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-10-23 17:52:30 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-10-23 17:52:30 +0000 |
| commit | 243a6be085fe6a7ce49169864c68a8839735e49b (patch) | |
| tree | abfecf3c23dc7512ca48e72ac418b149c865e0f3 /src/algorithm.cpp | |
| parent | 1147845301c03308e3419b89c28c77bb6917fe04 (diff) | |
Vendor import of stripped libc++ trunk r375505, the last commit beforevendor/libc++/libc++-trunk-r375505vendor/libc++
the upstream Subversion repository was made read-only, and the LLVM
project migrated to GitHub:
https://llvm.org/svn/llvm-project/libcxx/trunk@375505
Notes
Notes:
svn path=/vendor/libc++/dist/; revision=353946
svn path=/vendor/libc++/libc++-r375505/; revision=353947; tag=vendor/libc++/libc++-trunk-r375505
Diffstat (limited to 'src/algorithm.cpp')
| -rw-r--r-- | src/algorithm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/algorithm.cpp b/src/algorithm.cpp index a110ae8b1a6e..ffdcb5fccde7 100644 --- a/src/algorithm.cpp +++ b/src/algorithm.cpp @@ -10,7 +10,7 @@ #include "random" #ifndef _LIBCPP_HAS_NO_THREADS #include "mutex" -#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA) +#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA) #pragma comment(lib, "pthread") #endif #endif |