Author: cbieneman
Date: Wed Dec 16 12:42:14 2015
New Revision: 255798
URL: http://llvm.org/viewvc/llvm-project?rev=255798&view=rev
Log:
[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.
Modified:
cfe/trunk/runtime/CMakeLists.txt
Modified: cfe/trunk/runtime/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/CMakeLists.txt?rev=255798&r1=255797&r2=255798&view=diff
==============================================================================
--- cfe/trunk/runtime/CMakeLists.txt (original)
+++ cfe/trunk/runtime/CMakeLists.txt Wed Dec 16 12:42:14 2015
@@ -56,6 +56,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND E
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 E
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)
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
