summaryrefslogtreecommitdiffstats
path: root/libcxx/cmake
diff options
context:
space:
mode:
authorPetr Hosek <phosek@chromium.org>2018-07-25 22:57:39 +0000
committerPetr Hosek <phosek@chromium.org>2018-07-25 22:57:39 +0000
commit9d1bcc2a8887d3965d8b071eceb88f0f2eab53a2 (patch)
tree8e925ed47f9a925841ef4e31495032992625bb0e /libcxx/cmake
parentab4d730f14d14da9d760b8902a27fc9cfedf7d70 (diff)
downloadbcm5719-llvm-9d1bcc2a8887d3965d8b071eceb88f0f2eab53a2.tar.gz
bcm5719-llvm-9d1bcc2a8887d3965d8b071eceb88f0f2eab53a2.zip
[CMake] Don't install c++abi headers in standalone libc++ build
This is a refinement on r337833. Previously we were installing two copies of c++abi headers in libc++ build directory, one in include/c++build and another one in include/c++/v1. However, the second copy is unnecessary when building libc++ standalone. Differential Revision: https://reviews.llvm.org/D49752 llvm-svn: 337979
Diffstat (limited to 'libcxx/cmake')
-rw-r--r--libcxx/cmake/Modules/HandleLibCXXABI.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake
index 54b1e128617..ef3b4f5dde2 100644
--- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake
+++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake
@@ -48,7 +48,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs)
COMMENT "Copying C++ ABI header ${fpath}...")
list(APPEND abilib_headers "${dst}")
- if (NOT LIBCXX_USING_INSTALLED_LLVM)
+ if (NOT LIBCXX_USING_INSTALLED_LLVM AND LIBCXX_HEADER_DIR)
set(dst "${LIBCXX_HEADER_DIR}/include/c++/v1/${dstdir}/${fpath}")
add_custom_command(OUTPUT ${dst}
DEPENDS ${src}
OpenPOWER on IntegriCloud