Skip to content

Commit eaed095

Browse files
authored
Revert "Reapply "[libc++abi] Stop copying headers to the build directory"" (#115793)
Reverts #115379 Reverting since this broke the Fuchsia builders.
1 parent 28cdebf commit eaed095

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

libcxxabi/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@ set(LIBCXXABI_STATIC_OUTPUT_NAME "c++abi" CACHE STRING "Output name for the stat
8686

8787
set(LIBCXXABI_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/c++/v1" CACHE STRING "Path to install the libc++abi headers at.")
8888

89+
if(LLVM_LIBRARY_OUTPUT_INTDIR)
90+
set(LIBCXXABI_GENERATED_INCLUDE_DIR "${LLVM_BINARY_DIR}/include/c++/v1")
91+
else()
92+
set(LIBCXXABI_GENERATED_INCLUDE_DIR "${CMAKE_BINARY_DIR}/include/c++/v1")
93+
endif()
94+
8995
set(LIBCXXABI_LIBCXX_LIBRARY_PATH "" CACHE PATH "The path to libc++ library.")
9096
set(LIBCXXABI_LIBRARY_VERSION "1.0" CACHE STRING
9197
"Version of libc++abi. This will be reflected in the name of the shared \

libcxxabi/include/CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,20 @@ set(files
33
cxxabi.h
44
)
55

6+
foreach(f ${files})
7+
set(src "${CMAKE_CURRENT_SOURCE_DIR}/${f}")
8+
set(dst "${LIBCXXABI_GENERATED_INCLUDE_DIR}/${f}")
9+
add_custom_command(OUTPUT ${dst}
10+
DEPENDS ${src}
11+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst}
12+
COMMENT "Copying CXXABI header ${f}")
13+
list(APPEND _all_includes "${dst}")
14+
endforeach()
15+
16+
add_custom_target(generate-cxxabi-headers ALL DEPENDS ${_all_includes})
17+
618
add_library(cxxabi-headers INTERFACE)
19+
add_dependencies(cxxabi-headers generate-cxxabi-headers)
720
target_include_directories(cxxabi-headers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
821

922
if (LIBCXXABI_INSTALL_HEADERS)

0 commit comments

Comments
 (0)