[llvm] r199714 - Fix libstdc++4.7 test on Android.

Evgeniy Stepanov eugeni.stepanov at gmail.com
Tue Jan 21 01:00:30 PST 2014


Author: eugenis
Date: Tue Jan 21 03:00:30 2014
New Revision: 199714

URL: http://llvm.org/viewvc/llvm-project?rev=199714&view=rev
Log:
Fix libstdc++4.7 test on Android.

Modified:
    llvm/trunk/cmake/modules/HandleLLVMOptions.cmake

Modified: llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/HandleLLVMOptions.cmake?rev=199714&r1=199713&r2=199714&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/HandleLLVMOptions.cmake (original)
+++ llvm/trunk/cmake/modules/HandleLLVMOptions.cmake Tue Jan 21 03:00:30 2014
@@ -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);





More information about the llvm-commits mailing list