diff options
| author | Petr Hosek <phosek@chromium.org> | 2018-04-09 04:36:04 +0000 |
|---|---|---|
| committer | Petr Hosek <phosek@chromium.org> | 2018-04-09 04:36:04 +0000 |
| commit | f73514c81060cfb8f718b2b18322fe902a9d6f8c (patch) | |
| tree | 58fc7b626a7aedfa2db5a33390d8f5d5212acb5f /libcxx/cmake | |
| parent | e10ef3548f7a413fc5ad26e212c792b3aebd77f4 (diff) | |
| download | bcm5719-llvm-f73514c81060cfb8f718b2b18322fe902a9d6f8c.tar.gz bcm5719-llvm-f73514c81060cfb8f718b2b18322fe902a9d6f8c.zip | |
Revert "[CMake] Use custom command and target to install libc++ headers"
This reverts commit r329544 which is failing on libcxx standalone bots.
llvm-svn: 329545
Diffstat (limited to 'libcxx/cmake')
| -rw-r--r-- | libcxx/cmake/Modules/HandleLibCXXABI.cmake | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake index 851ff9ec19a..558e11ba2cc 100644 --- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake +++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake @@ -47,22 +47,12 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) set(found TRUE) get_filename_component(dstdir ${fpath} PATH) get_filename_component(ifile ${fpath} NAME) - set(src ${incpath}/${fpath}) - - set(dst ${LIBCXX_BINARY_INCLUDE_DIR}/${dstdir}/${fpath}) - add_custom_command(OUTPUT ${dst} - DEPENDS ${src} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst} - COMMENT "Copying C++ ABI header ${fpath}...") - list(APPEND abilib_headers "${dst}") - - set(dst "${CMAKE_BINARY_DIR}/include/c++/v1/${dstdir}/${fpath}") - add_custom_command(OUTPUT ${dst} - DEPENDS ${src} - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst} - COMMENT "Copying C++ ABI header ${fpath}...") - list(APPEND abilib_headers "${dst}") - + file(COPY "${incpath}/${fpath}" + DESTINATION "${LIBCXX_BINARY_INCLUDE_DIR}/${dstdir}" + ) + file(COPY "${incpath}/${fpath}" + DESTINATION "${CMAKE_BINARY_DIR}/include/c++/v1/${dstdir}" + ) if (LIBCXX_INSTALL_HEADERS) install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}" DESTINATION ${LIBCXX_INSTALL_PREFIX}include/c++/v1/${dstdir} @@ -70,6 +60,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ ) endif() + list(APPEND abilib_headers "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}") endif() endforeach() if (NOT found) @@ -78,7 +69,6 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs) endforeach() include_directories("${LIBCXX_BINARY_INCLUDE_DIR}") - add_custom_target(cxx-abi-headers ALL DEPENDS ${abilib_headers}) endmacro() |
