diff options
| author | Don Hinton <hintonda@gmail.com> | 2018-01-23 03:30:23 +0000 |
|---|---|---|
| committer | Don Hinton <hintonda@gmail.com> | 2018-01-23 03:30:23 +0000 |
| commit | 66ddb50e44a7b7b03aadbef39a3a3058d1a7d8ff (patch) | |
| tree | 6a8378af642fefd9d81b0f988fe6165bcd188213 /libcxx/cmake | |
| parent | 4801624ee344803a09213d12c970ee322d180b7b (diff) | |
| download | bcm5719-llvm-66ddb50e44a7b7b03aadbef39a3a3058d1a7d8ff.tar.gz bcm5719-llvm-66ddb50e44a7b7b03aadbef39a3a3058d1a7d8ff.zip | |
[cmake] Always respect existing CMAKE_REQUIRED_FLAGS when adding additional ones.
* Previously part of https://reviews.llvm.org/D41622.
llvm-svn: 323171
Diffstat (limited to 'libcxx/cmake')
| -rw-r--r-- | libcxx/cmake/Modules/CheckLibcxxAtomic.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake b/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake index a7ae667a155..2d3b0f404de 100644 --- a/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake +++ b/libcxx/cmake/Modules/CheckLibcxxAtomic.cmake @@ -9,7 +9,7 @@ INCLUDE(CheckCXXSourceCompiles) function(check_cxx_atomics varname) set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) - set(CMAKE_REQUIRED_FLAGS "-nodefaultlibs -std=c++11 -nostdinc++ -isystem ${LIBCXX_SOURCE_DIR}/include") + set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -nodefaultlibs -std=c++11 -nostdinc++ -isystem ${LIBCXX_SOURCE_DIR}/include") if (${LIBCXX_GCC_TOOLCHAIN}) set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} --gcc-toolchain=${LIBCXX_GCC_TOOLCHAIN}") endif() |
