Merge pull request #9377 from swiftlang/cherry-pick/20240723-genvt-deps-edge

porglezomp · web-flow · commit b1f6197d6ad9 · 2024-11-08T12:58:46.000-08:00
[stable/20240723] Cherry-pick the GenVT deps edge fixes
diff --git a/clang/lib/CodeGen/CMakeLists.txt b/clang/lib/CodeGen/CMakeLists.txt
@@ -143,6 +143,7 @@ add_clang_library(clangCodeGen
   VarBypassDetector.cpp
 
   DEPENDS
+  vt_gen
   intrinsics_gen
   ClangDriverOptions
   # These generated headers are included transitively.
diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
@@ -36,6 +36,9 @@ endif()
 if(omp_gen IN_LIST LLVM_COMMON_DEPENDS)
   list(REMOVE_ITEM LLVM_COMMON_DEPENDS omp_gen)
 endif()
+if(vt_gen IN_LIST LLVM_COMMON_DEPENDS)
+  list(REMOVE_ITEM LLVM_COMMON_DEPENDS vt_gen)
+endif()
 
 #
 # Generate LLVMConfig.cmake for the build tree.
diff --git a/llvm/cmake/modules/LLVMConfig.cmake.in b/llvm/cmake/modules/LLVMConfig.cmake.in
@@ -151,6 +151,9 @@ endif()
 if(NOT TARGET intrinsics_gen)
   add_custom_target(intrinsics_gen)
 endif()
+if(NOT TARGET vt_gen)
+  add_custom_target(vt_gen)
+endif()
 if(NOT TARGET omp_gen)
   add_custom_target(omp_gen)
 endif()

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,9 @@ endif()`
`36`	`36`	`if(omp_gen IN_LIST LLVM_COMMON_DEPENDS)`
`37`	`37`	`list(REMOVE_ITEM LLVM_COMMON_DEPENDS omp_gen)`
`38`	`38`	`endif()`
	`39`	`+if(vt_gen IN_LIST LLVM_COMMON_DEPENDS)`
	`40`	`+ list(REMOVE_ITEM LLVM_COMMON_DEPENDS vt_gen)`
	`41`	`+endif()`
`39`	`42`
`40`	`43`	`#`
`41`	`44`	`# Generate LLVMConfig.cmake for the build tree.`