r308844 - [Modules] Rework r274270. Let Clang targets depend on intrinsics_gen.

NAKAMURA Takumi via cfe-commits cfe-commits at lists.llvm.org
Sat Jul 22 22:09:44 PDT 2017


Author: chapuni
Date: Sat Jul 22 22:09:44 2017
New Revision: 308844

URL: http://llvm.org/viewvc/llvm-project?rev=308844&view=rev
Log:
[Modules] Rework r274270. Let Clang targets depend on intrinsics_gen.

This gets rid of almost LLVM targets unconditionally depending on intrinsic_gen.

Clang's modules still have weird dependencies and hard to remove intrinsics_gen in better way.
Then, it'd be better to give whole clang targets depend on intrinsic_gen.

Modified:
    cfe/trunk/CMakeLists.txt

Modified: cfe/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=308844&r1=308843&r2=308844&view=diff
==============================================================================
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Sat Jul 22 22:09:44 2017
@@ -413,6 +413,13 @@ add_subdirectory(include)
 get_property(CLANG_TABLEGEN_TARGETS GLOBAL PROPERTY CLANG_TABLEGEN_TARGETS)
 list(APPEND LLVM_COMMON_DEPENDS ${CLANG_TABLEGEN_TARGETS})
 
+# 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.
+if(LLVM_ENABLE_MODULES AND NOT CLANG_BUILT_STANDALONE)
+  list(APPEND LLVM_COMMON_DEPENDS intrinsics_gen)
+endif()
+
 add_subdirectory(lib)
 add_subdirectory(tools)
 add_subdirectory(runtime)




More information about the cfe-commits mailing list