summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Bieneman <beanz@apple.com>2015-10-02 22:28:48 +0000
committerChris Bieneman <beanz@apple.com>2015-10-02 22:28:48 +0000
commit042e817bff760613c86f98e0d259a5f282471405 (patch)
treef10b38b9c6a84b3aacbd0809b9622292ba6ae093
parentd9b5be4c83394fbc1ed568b9b4df09adef24a975 (diff)
downloadbcm5719-llvm-042e817bff760613c86f98e0d259a5f282471405.tar.gz
bcm5719-llvm-042e817bff760613c86f98e0d259a5f282471405.zip
[CMake] We need to explicitly add llvm-config before clang so that LLVM_BUILD_EXTERNAL_COMPILER_RT can depend on llvm-config.
This patch is a required stepping stone to fix PR14109. llvm-svn: 249202
-rw-r--r--llvm/tools/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/llvm/tools/CMakeLists.txt b/llvm/tools/CMakeLists.txt
index 952e114408a..1b57d7abd13 100644
--- a/llvm/tools/CMakeLists.txt
+++ b/llvm/tools/CMakeLists.txt
@@ -30,10 +30,11 @@ if(CYGWIN OR NOT LLVM_ENABLE_PIC)
set(LLVM_TOOL_LLVM_LTO_BUILD Off)
endif()
-# Add LTO and llvm-ar before clang, ExternalProject requires targets specified
-# in DEPENDS to exist before the call to ExternalProject_Add.
+# Add LTO, llvm-ar, and llvm-config before clang, ExternalProject requires
+# targets specified in DEPENDS to exist before the call to ExternalProject_Add.
add_llvm_tool_subdirectory(lto)
add_llvm_tool_subdirectory(llvm-ar)
+add_llvm_tool_subdirectory(llvm-config)
# Projects supported via LLVM_EXTERNAL_*_SOURCE_DIR need to be explicitly
# specified.
OpenPOWER on IntegriCloud