summaryrefslogtreecommitdiffstats
path: root/libcxx/lib
diff options
context:
space:
mode:
authorPetr Hosek <phosek@chromium.org>2018-06-12 06:58:06 +0000
committerPetr Hosek <phosek@chromium.org>2018-06-12 06:58:06 +0000
commita9e7908e3066ef1d24970002108262cc46be3e5d (patch)
tree8085e7e78d280c427c92b20eba9d987e91225f16 /libcxx/lib
parentd9be2c7e64a28f359433942f57756a6408ca023c (diff)
downloadbcm5719-llvm-a9e7908e3066ef1d24970002108262cc46be3e5d.tar.gz
bcm5719-llvm-a9e7908e3066ef1d24970002108262cc46be3e5d.zip
[CMake] Use common variable for all header targets NFC
This simplifies the handling of header targets. llvm-svn: 334477
Diffstat (limited to 'libcxx/lib')
-rw-r--r--libcxx/lib/CMakeLists.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/libcxx/lib/CMakeLists.txt b/libcxx/lib/CMakeLists.txt
index 3ea21ae584d..cba5aa9e8b0 100644
--- a/libcxx/lib/CMakeLists.txt
+++ b/libcxx/lib/CMakeLists.txt
@@ -189,8 +189,8 @@ split_list(LIBCXX_LINK_FLAGS)
# Add an object library that contains the compiled source files.
add_library(cxx_objects OBJECT ${exclude_from_all} ${LIBCXX_SOURCES} ${LIBCXX_HEADERS})
-if(LIBCXX_CXX_ABI_LIBRARY_HEADERS)
- add_dependencies(cxx_objects ${LIBCXX_CXX_ABI_LIBRARY_HEADERS})
+if(LIBCXX_CXX_ABI_HEADER_TARGET)
+ add_dependencies(cxx_objects ${LIBCXX_CXX_ABI_HEADER_TARGET})
endif()
if(WIN32 AND NOT MINGW)
target_compile_definitions(cxx_objects
@@ -286,8 +286,7 @@ if (LIBCXX_ENABLE_STATIC)
endif()
# Add a meta-target for both libraries.
-add_custom_target(cxx DEPENDS ${LIBCXX_TARGETS})
-add_dependencies(cxx cxx-headers ${LIBCXX_ABI_HEADERS_TARGET})
+add_custom_target(cxx DEPENDS cxx_headers ${LIBCXX_TARGETS})
if (LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY)
file(GLOB LIBCXX_EXPERIMENTAL_SOURCES ../src/experimental/*.cpp)
OpenPOWER on IntegriCloud