From 39ea5d74b283d5a42f34b856d22bfaf806a1c907 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Tue, 30 Jun 2020 09:28:41 +0100 Subject: [PATCH] Revert "Fix missing build dependency on omp_gen." 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 | 2 -- llvm/include/llvm/Frontend/OpenMP/CMakeLists.txt | 2 -- 2 files changed, 4 deletions(-) diff --git a/llvm/include/llvm/CMakeLists.txt b/llvm/include/llvm/CMakeLists.txt index 29c1c74..7cf8699a 100644 --- a/llvm/include/llvm/CMakeLists.txt +++ b/llvm/include/llvm/CMakeLists.txt @@ -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) diff --git a/llvm/include/llvm/Frontend/OpenMP/CMakeLists.txt b/llvm/include/llvm/Frontend/OpenMP/CMakeLists.txt index 5215070..9bdc4b8 100644 --- a/llvm/include/llvm/Frontend/OpenMP/CMakeLists.txt +++ b/llvm/include/llvm/Frontend/OpenMP/CMakeLists.txt @@ -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) -- 2.7.4