Recommit r274270, [CMake] Module builds depend on target intrinsics_gen to be built...

The builder clang-x86_64-linux-selfhost-modules-2 complains. Investigating.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@308439 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 70bc63d99395ec6426ba746e05505a3a17916869..61ecfdf970d09096fbb9c4d74e82fad3b5cc2568 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -843,6 +843,15 @@ add_subdirectory(lib/TableGen)
 
 add_subdirectory(utils/TableGen)
 
+# Force target to be built as soon as possible. Clang modules builds depend
+# header-wise on it as they ship all headers from the umbrella folders. Building
+# an entire module might include header, which depends on intrinsics_gen. This
+# should be right after LLVMSupport and LLVMTableGen otherwise we introduce a
+# circular dependence.
+if (LLVM_ENABLE_MODULES)
+  list(APPEND LLVM_COMMON_DEPENDS intrinsics_gen)
+endif(LLVM_ENABLE_MODULES)
+
 add_subdirectory(include/llvm)
 
 add_subdirectory(lib)