[libcxx] r261383 - Fix PR26622 - Make CheckLibcxxAtomic.cmake use the libc++ headers.

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Fri Feb 19 16:24:43 PST 2016


Author: ericwf
Date: Fri Feb 19 18:24:43 2016
New Revision: 261383

URL: http://llvm.org/viewvc/llvm-project?rev=261383&view=rev
Log:
Fix PR26622 - Make CheckLibcxxAtomic.cmake use the libc++ headers.

Modified:
    libcxx/trunk/cmake/Modules/CheckLibcxxAtomic.cmake

Modified: libcxx/trunk/cmake/Modules/CheckLibcxxAtomic.cmake
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/cmake/Modules/CheckLibcxxAtomic.cmake?rev=261383&r1=261382&r2=261383&view=diff
==============================================================================
--- libcxx/trunk/cmake/Modules/CheckLibcxxAtomic.cmake (original)
+++ libcxx/trunk/cmake/Modules/CheckLibcxxAtomic.cmake Fri Feb 19 18:24:43 2016
@@ -9,9 +9,9 @@ INCLUDE(CheckCXXSourceCompiles)
 
 function(check_cxx_atomics varname)
   set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-  set(CMAKE_REQUIRED_FLAGS "-std=c++11")
+  set(CMAKE_REQUIRED_FLAGS "-std=c++11 -nostdinc++ -isystem ${LIBCXX_SOURCE_DIR}/include")
   if (${LIBCXX_GCC_TOOLCHAIN})
-    set(CMAKE_REQUIRED_FLAGS "-std=c++11 --gcc-toolchain=${LIBCXX_GCC_TOOLCHAIN}")
+    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} --gcc-toolchain=${LIBCXX_GCC_TOOLCHAIN}")
   endif()
   check_cxx_source_compiles("
 #include <cstdint>




More information about the cfe-commits mailing list