diff options
| author | Dan Albert <danalbert@google.com> | 2014-07-10 02:20:11 +0000 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-07-10 02:20:11 +0000 |
| commit | a770f9d66b9508c42c729f8d2200c4d11a2b7484 (patch) | |
| tree | 4fddb17f0b6c0722e1b1399d7aaed0ca94650bd3 /libcxxabi/src | |
| parent | 8c074015047cf88fea703d981ba214d895a744d3 (diff) | |
| download | bcm5719-llvm-a770f9d66b9508c42c729f8d2200c4d11a2b7484.tar.gz bcm5719-llvm-a770f9d66b9508c42c729f8d2200c4d11a2b7484.zip | |
Add lit configs for libcxxabi tests.
This makes running libcxxabi tests on Linux _much_ easier.
Adds a check-libcxxabi target to cmake.
Also defaults to building a dynamic libc++abi. This is so that the
default options still test the libc++abi that is being built. There are
two problems with testing a static libc++abi. In the case of a
standalone build, the tests will link the system's libc++, which might
not have been built against our libc++abi. In the case of an in tree
build, libc++ will prefer a dynamic libc++abi from the system over a
static libc++abi from the output directory.
llvm-svn: 212672
Diffstat (limited to 'libcxxabi/src')
| -rw-r--r-- | libcxxabi/src/CMakeLists.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libcxxabi/src/CMakeLists.txt b/libcxxabi/src/CMakeLists.txt index d8f22b92654..4bf860a91df 100644 --- a/libcxxabi/src/CMakeLists.txt +++ b/libcxxabi/src/CMakeLists.txt @@ -48,13 +48,7 @@ else() ) endif() -if (LIBCXXABI_LIBCXX_INCLUDES) - include_directories("${LIBCXXABI_LIBCXX_INCLUDES}") -elseif (NOT LIBCXXABI_BUILT_STANDALONE) - include_directories("${LLVM_MAIN_SRC_DIR}/projects/libcxx/include") -else() - include_directories("${LLVM_INCLUDE_DIR}/c++/v1") -endif() +include_directories("${LIBCXXABI_LIBCXX_INCLUDES}") # Generate library list. set(libraries ${LIBCXXABI_CXX_ABI_LIBRARIES}) |
