summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Stellard <tstellar@redhat.com>2018-12-05 00:16:11 +0000
committerTom Stellard <tstellar@redhat.com>2018-12-05 00:16:11 +0000
commit1d3cb9452f23ae705ee23b4c2f588a1df9a0c2f1 (patch)
tree52fbc325c456782d26647d2514aa42821e4f6fea
parent5b036d9701f6a8190b75d74b95a6b5b52ab5f5ad (diff)
downloadbcm5719-llvm-1d3cb9452f23ae705ee23b4c2f588a1df9a0c2f1.tar.gz
bcm5719-llvm-1d3cb9452f23ae705ee23b4c2f588a1df9a0c2f1.zip
Merging r343753:
------------------------------------------------------------------------ r343753 | phosek | 2018-10-03 22:38:53 -0700 (Wed, 03 Oct 2018) | 7 lines [CMake] Use just basename when copying C++ ABI headers This avoids duplicate directories when the filename includes path. Fixes PR39145 Differential Revision: https://reviews.llvm.org/D52762 ------------------------------------------------------------------------ llvm-svn: 348322
-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 ef3b4f5dde2..1c19d7e01af 100644
--- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake
+++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake
@@ -41,7 +41,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs)
get_filename_component(ifile ${fpath} NAME)
set(src ${incpath}/${fpath})
- set(dst ${LIBCXX_BINARY_INCLUDE_DIR}/${dstdir}/${fpath})
+ set(dst ${LIBCXX_BINARY_INCLUDE_DIR}/${dstdir}/${ifile})
add_custom_command(OUTPUT ${dst}
DEPENDS ${src}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst}
OpenPOWER on IntegriCloud