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

[CMake] Add a missing target dependency on C++ ABI headers 

This resolves the breakage introduced in r334468 which results in
build error when using CMake Makefile generator.

llvm-svn: 334470
This commit is contained in:
Petr Hosek 2018-06-12 03:31:03 +00:00
parent cfd7eec3d8
commit 0aa70faf9b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,7 @@ macro(setup_abi_lib abidefines abilib abifiles abidirs)
include_directories("${LIBCXX_BINARY_INCLUDE_DIR}")
add_custom_target(cxx-abi-headers ALL DEPENDS ${abilib_headers})
set(LIBCXX_ABI_HEADERS_TARGET cxx-abi-headers)
endmacro()

2
libcxx/lib/CMakeLists.txt
View File

@ -287,7 +287,7 @@ endif()
# Add a meta-target for both libraries.
add_custom_target(cxx DEPENDS ${LIBCXX_TARGETS})
add_dependencies(cxx cxx-headers)
add_dependencies(cxx cxx-headers ${LIBCXX_ABI_HEADERS_TARGET})
if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY)
file(GLOB LIBCXX_EXPERIMENTAL_SOURCES ../src/experimental/*.cpp)