From 0aa70faf9b28f2711957ab808558e86d18773ca0 Mon Sep 17 00:00:00 2001 From: Petr Hosek Date: Tue, 12 Jun 2018 03:31:03 +0000 Subject: [PATCH] [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 --- libcxx/cmake/Modules/HandleLibCXXABI.cmake | 1 + libcxx/lib/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/libcxx/cmake/Modules/HandleLibCXXABI.cmake b/libcxx/cmake/Modules/HandleLibCXXABI.cmake index 851ff9ec19ae..526a146015f4 100644 --- a/libcxx/cmake/Modules/HandleLibCXXABI.cmake +++ b/libcxx/cmake/Modules/HandleLibCXXABI.cmake @@ -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() diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt index b99f5db676d5..3ea21ae584da 100644 --- a/libcxx/lib/CMakeLists.txt +++ b/libcxx/lib/CMakeLists.txt @@ -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)