From 77c5e78e716247544fbb0dff45aa1cff89542f52 Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Wed, 16 Dec 2015 18:42:14 +0000 Subject: [CMake] ExternalProject for compiler-rt needs to depend on llvm-config and clang The add_dependencies call on compiler-rt-configure adds llvm-config and clang to the phony target, but not to the actual configure custom command. We need the dependency bound to the custom command so that it can't be re-ordered by Ninja. llvm-svn: 255798 --- clang/runtime/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'clang/runtime') diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt index 1443580fa59..4775b0d25da 100644 --- a/clang/runtime/CMakeLists.txt +++ b/clang/runtime/CMakeLists.txt @@ -56,6 +56,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) endforeach() ExternalProject_Add(compiler-rt + DEPENDS llvm-config clang PREFIX ${COMPILER_RT_PREFIX} SOURCE_DIR ${COMPILER_RT_SRC_ROOT} STAMP_DIR ${STAMP_DIR} @@ -87,8 +88,6 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) WORKING_DIRECTORY ${BINARY_DIR} ) - add_dependencies(compiler-rt-configure clang llvm-config) - install(CODE "execute_process\(COMMAND \${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=\${CMAKE_INSTALL_PREFIX} -P ${BINARY_DIR}/cmake_install.cmake \)" COMPONENT compiler-rt) -- cgit v1.2.1