Skip to content

Commit 960086c

Browse files
[CMake] Cleanup TableGen dependency handling
Clang and LLVM always provide those tablegen targets, so we don't need to check their existence. Also adding `intrinsic_gen` as a dependency. See #12147
1 parent 3feb5ae commit 960086c

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

lib/CMakeLists.txt

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -94,15 +94,9 @@ file(GENERATE
9494
#include \"swift/SILOptimizer/OptimizerBridging.h\"
9595
")
9696
add_library(importedHeaderDependencies "${CMAKE_CURRENT_BINARY_DIR}/HeaderDependencies.cpp")
97-
98-
# When building unified, we need to make sure all the Clang headers are
99-
# generated before we try to use them.
100-
# When building Swift against an already compiled LLVM/Clang, like
101-
# build-script does, this target does not exist, but the headers
102-
# are already completely generated at that point.
103-
if(TARGET clang-tablegen-targets)
104-
add_dependencies(importedHeaderDependencies clang-tablegen-targets)
105-
endif()
97+
# Respect LLVM_COMMON_DEPENDS as well as `add_swift_X` does to ensure
98+
# all prerequisites like TableGen'ed headers are generated before.
99+
add_dependencies(importedHeaderDependencies ${LLVM_COMMON_DEPENDS})
106100

107101
add_subdirectory(APIDigester)
108102
add_subdirectory(AST)

0 commit comments

Comments
 (0)