modules: Add explicit dependency on intrinsics_gen

dexonsmith · dexonsmith · commit 544985203088 · 2015-06-16T00:44:12.000Z
`LLVM_ENABLE_MODULES` builds sometimes fail because `Intrinsics.td` needs to regenerate `Instrinsics.h` before anyone can include anything from the LLVM_IR module. Represent the dependency explicitly to prevent that. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239796 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AsmParser/CMakeLists.txt b/lib/AsmParser/CMakeLists.txt
@@ -6,4 +6,7 @@ add_llvm_library(LLVMAsmParser
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Analysis
+
+  DEPENDS
+  intrinsics_gen
   )
diff --git a/lib/Bitcode/Writer/CMakeLists.txt b/lib/Bitcode/Writer/CMakeLists.txt
@@ -3,4 +3,7 @@ add_llvm_library(LLVMBitWriter
   BitcodeWriter.cpp
   BitcodeWriterPass.cpp
   ValueEnumerator.cpp
+
+  DEPENDS
+  intrinsics_gen
   )
diff --git a/lib/ExecutionEngine/CMakeLists.txt b/lib/ExecutionEngine/CMakeLists.txt
@@ -9,6 +9,9 @@ add_llvm_library(LLVMExecutionEngine
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/ExecutionEngine
+
+  DEPENDS
+  intrinsics_gen
   )
 
 add_subdirectory(Interpreter)
diff --git a/lib/ExecutionEngine/MCJIT/CMakeLists.txt b/lib/ExecutionEngine/MCJIT/CMakeLists.txt
@@ -1,3 +1,6 @@
 add_llvm_library(LLVMMCJIT
   MCJIT.cpp
+
+  DEPENDS
+  intrinsics_gen
   )
diff --git a/lib/ExecutionEngine/Orc/CMakeLists.txt b/lib/ExecutionEngine/Orc/CMakeLists.txt
@@ -6,4 +6,7 @@ add_llvm_library(LLVMOrcJIT
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/ExecutionEngine/Orc
+
+  DEPENDS
+  intrinsics_gen
   )
diff --git a/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt b/lib/ExecutionEngine/RuntimeDyld/CMakeLists.txt
@@ -5,4 +5,7 @@ add_llvm_library(LLVMRuntimeDyld
   RuntimeDyldCOFF.cpp
   RuntimeDyldELF.cpp
   RuntimeDyldMachO.cpp
+
+  DEPENDS
+  intrinsics_gen
   )
diff --git a/lib/IRReader/CMakeLists.txt b/lib/IRReader/CMakeLists.txt
@@ -3,4 +3,7 @@ add_llvm_library(LLVMIRReader
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/IRReader
+
+  DEPENDS
+  intrinsics_gen
   )
diff --git a/lib/Linker/CMakeLists.txt b/lib/Linker/CMakeLists.txt
@@ -3,4 +3,7 @@ add_llvm_library(LLVMLinker
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Linker
+
+  DEPENDS
+  intrinsics_gen
   )
diff --git a/lib/Object/CMakeLists.txt b/lib/Object/CMakeLists.txt
@@ -18,4 +18,7 @@ add_llvm_library(LLVMObject
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/Object
+
+  DEPENDS
+  intrinsics_gen
   )
diff --git a/lib/ProfileData/CMakeLists.txt b/lib/ProfileData/CMakeLists.txt
@@ -11,4 +11,7 @@ add_llvm_library(LLVMProfileData
 
   ADDITIONAL_HEADER_DIRS
   ${LLVM_MAIN_INCLUDE_DIR}/llvm/ProfileData
+
+  DEPENDS
+  intrinsics_gen
   )
diff --git a/lib/Transforms/Hello/CMakeLists.txt b/lib/Transforms/Hello/CMakeLists.txt
@@ -12,4 +12,7 @@ endif()
 
 add_llvm_loadable_module( LLVMHello
   Hello.cpp
+
+  DEPENDS
+  intrinsics_gen
   )
diff --git a/unittests/ADT/CMakeLists.txt b/unittests/ADT/CMakeLists.txt
@@ -46,3 +46,5 @@ set(ADTSources
 add_llvm_unittest(ADTTests
   ${ADTSources}
   )
+
+add_dependencies(ADTTests intrinsics_gen)

Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,7 @@ add_llvm_library(LLVMAsmParser`
`6`	`6`
`7`	`7`	`ADDITIONAL_HEADER_DIRS`
`8`	`8`	`${LLVM_MAIN_INCLUDE_DIR}/llvm/Analysis`
	`9`	`+`
	`10`	`+ DEPENDS`
	`11`	`+ intrinsics_gen`
`9`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,7 @@ add_llvm_library(LLVMBitWriter`
`3`	`3`	`BitcodeWriter.cpp`
`4`	`4`	`BitcodeWriterPass.cpp`
`5`	`5`	`ValueEnumerator.cpp`
	`6`	`+`
	`7`	`+ DEPENDS`
	`8`	`+ intrinsics_gen`
`6`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,9 @@ add_llvm_library(LLVMExecutionEngine`
`9`	`9`
`10`	`10`	`ADDITIONAL_HEADER_DIRS`
`11`	`11`	`${LLVM_MAIN_INCLUDE_DIR}/llvm/ExecutionEngine`
	`12`	`+`
	`13`	`+ DEPENDS`
	`14`	`+ intrinsics_gen`
`12`	`15`	`)`
`13`	`16`
`14`	`17`	`add_subdirectory(Interpreter)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
`1`	`1`	`add_llvm_library(LLVMMCJIT`
`2`	`2`	`MCJIT.cpp`
	`3`	`+`
	`4`	`+ DEPENDS`
	`5`	`+ intrinsics_gen`
`3`	`6`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,4 +6,7 @@ add_llvm_library(LLVMOrcJIT`
`6`	`6`
`7`	`7`	`ADDITIONAL_HEADER_DIRS`
`8`	`8`	`${LLVM_MAIN_INCLUDE_DIR}/llvm/ExecutionEngine/Orc`
	`9`	`+`
	`10`	`+ DEPENDS`
	`11`	`+ intrinsics_gen`
`9`	`12`	`)`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,7 @@ add_llvm_library(LLVMRuntimeDyld`
`5`	`5`	`RuntimeDyldCOFF.cpp`
`6`	`6`	`RuntimeDyldELF.cpp`
`7`	`7`	`RuntimeDyldMachO.cpp`
	`8`	`+`
	`9`	`+ DEPENDS`
	`10`	`+ intrinsics_gen`
`8`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,7 @@ add_llvm_library(LLVMIRReader`
`3`	`3`
`4`	`4`	`ADDITIONAL_HEADER_DIRS`
`5`	`5`	`${LLVM_MAIN_INCLUDE_DIR}/llvm/IRReader`
	`6`	`+`
	`7`	`+ DEPENDS`
	`8`	`+ intrinsics_gen`
`6`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,7 @@ add_llvm_library(LLVMLinker`
`3`	`3`
`4`	`4`	`ADDITIONAL_HEADER_DIRS`
`5`	`5`	`${LLVM_MAIN_INCLUDE_DIR}/llvm/Linker`
	`6`	`+`
	`7`	`+ DEPENDS`
	`8`	`+ intrinsics_gen`
`6`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,7 @@ add_llvm_library(LLVMObject`
`18`	`18`
`19`	`19`	`ADDITIONAL_HEADER_DIRS`
`20`	`20`	`${LLVM_MAIN_INCLUDE_DIR}/llvm/Object`
	`21`	`+`
	`22`	`+ DEPENDS`
	`23`	`+ intrinsics_gen`
`21`	`24`	`)`
Original file line number	Diff line number	Diff line change
`@@ -11,4 +11,7 @@ add_llvm_library(LLVMProfileData`
`11`	`11`
`12`	`12`	`ADDITIONAL_HEADER_DIRS`
`13`	`13`	`${LLVM_MAIN_INCLUDE_DIR}/llvm/ProfileData`
	`14`	`+`
	`15`	`+ DEPENDS`
	`16`	`+ intrinsics_gen`
`14`	`17`	`)`