diff options
author | Tom Stellard <tstellar@redhat.com> | 2018-12-05 00:16:11 +0000 |
---|---|---|
committer | Tom Stellard <tstellar@redhat.com> | 2018-12-05 00:16:11 +0000 |
commit | 0b2daebce41e73aff06e967affa8eec2622c36c5 (patch) | |
tree | 1f3173d499ba5945ace38c480d3162f87feb531a | |
parent | 768299fcdca447c2d1aa6a0914a233bc13122a61 (diff) |
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
------------------------------------------------------------------------
-rw-r--r-- | libcxx/cmake/Modules/HandleLibCXXABI.cmake | 2 |
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} |