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

[NAKAMURA Takumi via llvm-commits]

Author: chapuni
Date: Wed Jul 19 04:27:31 2017
New Revision: 308439

URL: http://llvm.org/viewvc/llvm-project?rev=308439&view=rev
Log:
Recommit r274270, [CMake] Module builds depend on target intrinsics_gen to be built first.

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

Modified:
    llvm/trunk/CMakeLists.txt

Modified: llvm/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/CMakeLists.txt?rev=308439&r1=308438&r2=308439&view=diff
==============================================================================
--- llvm/trunk/CMakeLists.txt (original)
+++ llvm/trunk/CMakeLists.txt Wed Jul 19 04:27:31 2017
@@ -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)