[libcxx-commits] [libcxx] b5aa674 - [libc++] Fix the installation of libc++ headers since the __config_site change

[Louis Dionne via libcxx-commits]

Author: Louis Dionne
Date: 2020-10-21T12:54:42-04:00
New Revision: b5aa67446e01bd277727b05710a42e69ac41e74b

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

LOG: [libc++] Fix the installation of libc++ headers since the __config_site change

Added: 
    

Modified: 
    libcxx/include/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libcxx/include/CMakeLists.txt b/libcxx/include/CMakeLists.txt
index a8d6f74ea38f..82af0e77e1ef 100644
--- a/libcxx/include/CMakeLists.txt
+++ b/libcxx/include/CMakeLists.txt
@@ -223,14 +223,14 @@ if (LIBCXX_INSTALL_HEADERS)
   endforeach()
 
   # Install the generated __config_site.
-  install(FILES ${LIBCXX_BINARY_DIR}/__config_site
+  install(FILES ${LIBCXX_GENERATED_INCLUDE_DIR}/__config_site
     DESTINATION ${LIBCXX_INSTALL_HEADER_PREFIX}include/c++/v1
     PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
     COMPONENT cxx-headers)
 
   if (NOT CMAKE_CONFIGURATION_TYPES)
     add_custom_target(install-cxx-headers
-                      DEPENDS cxx-headers cxx-generated-config
+                      DEPENDS cxx-headers
                       COMMAND "${CMAKE_COMMAND}"
                               -DCMAKE_INSTALL_COMPONENT=cxx-headers
                               -P "${CMAKE_BINARY_DIR}/cmake_install.cmake")