From 100ce64c6d294048fc1c2c0ff59362ac1f440ad5 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Sat, 20 Feb 2016 00:24:43 +0000 Subject: [PATCH] Fix PR26622 - Make CheckLibcxxAtomic.cmake use the libc++ headers. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@261383 91177308-0d34-0410-b5e6-96231b3b80d8 --- cmake/Modules/CheckLibcxxAtomic.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/CheckLibcxxAtomic.cmake b/cmake/Modules/CheckLibcxxAtomic.cmake index 9f2632736..ca490b3e7 100644 --- a/cmake/Modules/CheckLibcxxAtomic.cmake +++ b/cmake/Modules/CheckLibcxxAtomic.cmake @@ -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