replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[libc++] Do not install the C++ ABI library's headers as part of libc++'s build 

It's the role of the C++ ABI library to install its own headers, not libc++.
This fixes an existing issue causing spurious CI failures where both libc++
and libc++abi would try to install <cxxabi.h> & friends in the same location,
leading to failures during the installation step.

Differential Revision: https://reviews.llvm.org/D121706
This commit is contained in:
Louis Dionne 2022-03-15 11:17:08 -04:00
parent f9096b89dd
commit 0389462587
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libcxx/cmake/Modules/HandleLibCXXABI.cmake
View File

@ -15,8 +15,7 @@ include(GNUInstallDirs)
# libc++ build tree for the build. These files will be copied
# twice: once into include/, so the libc++ build itself can find
# them, and once into include/c++/v1, so that a clang built into
# the same build area will find them. These files will also be
# installed alongside the libc++ headers.
# the same build area will find them.
# abidirs : A list of relative paths to create under an include directory
# in the libc++ build directory.
#
@ -61,14 +60,6 @@ macro(setup_abi_lib abidefines abishared abistatic abifiles abidirs)
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst}
COMMENT "Copying C++ ABI header ${fpath}...")
list(APPEND abilib_headers "${dst}")
if (LIBCXX_INSTALL_HEADERS)
install(FILES "${LIBCXX_BINARY_INCLUDE_DIR}/${fpath}"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1/${dstdir}"
COMPONENT cxx-headers
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ
)
endif()
else()
message(STATUS "Looking for ${fpath} in ${incpath} - not found")
endif()

8
libcxx/docs/ReleaseNotes.rst
View File

@ -98,3 +98,11 @@ Build System Changes
library should set ``LIBCXXABI_HERMETIC_STATIC_LIBRARY=ON`` when configuring CMake. The current
behavior, which tries to guess the correct dll-export semantics based on whether we're building
the libc++ shared library, will be removed in LLVM 16.
- Previously, the C++ ABI library headers would be installed inside ``<prefix>/include/c++/v1``
alongside the libc++ headers as part of building libc++. This is not the case anymore -- the
ABI library is expected to install its headers where it wants them as part of its own build.
Note that no action is required for most users, who build libc++ against libc++abi, since
libc++abi already installs its headers in the right location. However, vendors building
libc++ against alternate ABI libraries should make sure that their ABI library installs
its own headers.