diff options
author | Shoaib Meenai <smeenai@fb.com> | 2018-06-30 01:25:47 +0000 |
---|---|---|
committer | Shoaib Meenai <smeenai@fb.com> | 2018-06-30 01:25:47 +0000 |
commit | 51d5cc9228f8ef283d6e80a88634f68e37211b7e (patch) | |
tree | 068998de378333114f8878ca689691e276efed4f /libcxxabi | |
parent | 777ec3765966e14791aa6289b35a4dc8d8e7aaa3 (diff) |
[libc++abi] Look for __config instead of vector
vector is a generic C++ header, whereas __config is libc++-specific, so
we can look for it instead to guarantee we're finding a libc++
installation. This was suggested by Eric in https://reviews.llvm.org/D48694.
This is less important now that we're limiting the header search to the
specified directories (which definitely shouldn't have any other C++
library's headers anyway), but it shouldn't hurt either. There's a
chance some other library could also be providing a __config header, so
there's still a trade-off there. It would be ideal if we could check for
the presence of both __config and vector in the same directory, but
there doesn't seem to be any easy way to do that in CMake.
llvm-svn: 336034
Diffstat (limited to 'libcxxabi')
-rw-r--r-- | libcxxabi/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index f8892e50bf3a..383bf96dcebe 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -110,7 +110,7 @@ endforeach() find_path( LIBCXXABI_LIBCXX_INCLUDES - vector + __config PATHS ${LIBCXXABI_LIBCXX_INCLUDES} ${LIBCXXABI_LIBCXX_PATH}/include ${CMAKE_BINARY_DIR}/${LIBCXXABI_LIBCXX_INCLUDES} |