[libcxx-commits] [libcxx] eea5cbc - [libcxx] Fix the libc++abi header path

[Petr Hosek via libcxx-commits]

Author: Petr Hosek
Date: 2021-04-27T23:30:53-07:00
New Revision: eea5cbc8583d0857e0a9e429c61f7e87122b4dd6

URL: https://github.com/llvm/llvm-project/commit/eea5cbc8583d0857e0a9e429c61f7e87122b4dd6
DIFF: https://github.com/llvm/llvm-project/commit/eea5cbc8583d0857e0a9e429c61f7e87122b4dd6.diff

LOG: [libcxx] Fix the libc++abi header path

This addresses an issue introduced in 775e55462a64.

Added: 
    

Modified: 
    libcxx/cmake/Modules/HandleLibCXXABI.cmake

Removed: 
    


################################################################################
diff  --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake
index 987bb40b53ffe..5a8a4a270a1a1 100644
--- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake
+++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake
@@ -54,7 +54,7 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs)
 
         # TODO: libc++ shouldn't be responsible for copying the libc++abi
         # headers into the right location.
-        set(dst "${LIBCXX_GENERATED_INCLUDE_DIR}/include/c++/v1/${dstdir}/${fpath}")
+        set(dst "${LIBCXX_GENERATED_INCLUDE_DIR}/${dstdir}/${fpath}")
         add_custom_command(OUTPUT ${dst}
             DEPENDS ${src}
             COMMAND ${CMAKE_COMMAND} -E copy_if_
diff erent ${src} ${dst}