summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-01-21 09:00:30 +0000
committerEvgeniy Stepanov <eugeni.stepanov@gmail.com>2014-01-21 09:00:30 +0000
commit2c2019b24581c93c95679068761e57e68e854d8a (patch)
treecf538428f7b32defd23f4450bc8c2a9aae6f57cf /cmake
parent8f74ea3fa165b63eeb4729c91c3ceccb8a9923e8 (diff)
downloadllvm-2c2019b24581c93c95679068761e57e68e854d8a.tar.gz
llvm-2c2019b24581c93c95679068761e57e68e854d8a.tar.bz2
llvm-2c2019b24581c93c95679068761e57e68e854d8a.tar.xz
Fix libstdc++4.7 test on Android.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@199714 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/HandleLLVMOptions.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
index 81f688dd01..b02182189e 100644
--- a/cmake/modules/HandleLLVMOptions.cmake
+++ b/cmake/modules/HandleLLVMOptions.cmake
@@ -30,6 +30,9 @@ if(NOT LLVM_FORCE_USE_OLD_TOOLCHAIN)
# libstdc++4.6 that is fixed in libstdc++4.7.
if(NOT LLVM_ENABLE_LIBCXX)
set(CMAKE_REQUIRED_FLAGS "-std=c++0x")
+ if (ANDROID)
+ set(CMAKE_REQUIRED_LIBRARIES "atomic")
+ endif()
check_cxx_source_compiles("
#include <atomic>
std::atomic<float> x(0.0f);