Revert "Fix missing build dependency on omp_gen."
authorSimon Tatham <simon.tatham@arm.com>
Tue, 30 Jun 2020 08:28:41 +0000 (09:28 +0100)
committerSimon Tatham <simon.tatham@arm.com>
Tue, 30 Jun 2020 08:37:45 +0000 (09:37 +0100)
This reverts commit ed4328c607306a2aa6df4833a0dce4482edbc94c.

My change apparently caused a buildbot to fail with the error

  CMake Error at /b/sanitizer-x86_64-linux-autoconf/build/tsan_release_build/lib/cmake/llvm/AddLLVM.cmake:869 (add_dependencies):
  The dependency target "omp_gen" of target "ScudoBenchmarks.x86_64" does not
  exist.

I don't at all understand why, because as far as I can see, the target
`omp_gen` is only added to `LLVM_COMMON_DEPENDS` after having been
created, so there //should// be no way it can end up on anything's
dependency list if it doesn't exist! But apparently it happened anyway.

Differential Revision: https://reviews.llvm.org/D82659

llvm/include/llvm/CMakeLists.txt
llvm/include/llvm/Frontend/OpenMP/CMakeLists.txt

index 29c1c74..7cf8699 100644 (file)
@@ -7,5 +7,3 @@ add_subdirectory(Frontend/OpenMP)
 if (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
   configure_file(module.modulemap.build module.modulemap COPYONLY)
 endif (NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
-
-set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} PARENT_SCOPE)
index 5215070..9bdc4b8 100644 (file)
@@ -1,5 +1,3 @@
 set(LLVM_TARGET_DEFINITIONS OMP.td)
 tablegen(LLVM OMP.h.inc --gen-directive-decls)
 add_public_tablegen_target(omp_gen)
-
-set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} PARENT_SCOPE)