[llvm-branch-commits] [libcxx] r348322 - Merging r343753:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Tue Dec  4 16:16:11 2018
New Revision: 348322

URL: http://llvm.org/viewvc/llvm-project?rev=348322&view=rev
Log:
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
------------------------------------------------------------------------

Modified:
    libcxx/branches/release_70/cmake/Modules/HandleLibCXXABI.cmake

Modified: libcxx/branches/release_70/cmake/Modules/HandleLibCXXABI.cmake
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_70/cmake/Modules/HandleLibCXXABI.cmake?rev=348322&r1=348321&r2=348322&view=diff
==============================================================================
--- libcxx/branches/release_70/cmake/Modules/HandleLibCXXABI.cmake (original)
+++ libcxx/branches/release_70/cmake/Modules/HandleLibCXXABI.cmake Tue Dec  4 16:16:11 2018
@@ -41,7 +41,7 @@ macro(setup_abi_lib abidefines abilib ab
         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}