Author: Raphael Isemann Date: 2020-12-08T20:41:35+01:00 New Revision: a2c157eb3ebc5ed7e8037f7942991bd344a882cc
URL: https://github.com/llvm/llvm-project/commit/a2c157eb3ebc5ed7e8037f7942991bd344a882cc DIFF: https://github.com/llvm/llvm-project/commit/a2c157eb3ebc5ed7e8037f7942991bd344a882cc.diff LOG: [cmake] Make ExecutionEngine/Orc/Shared depend on intrinsics_gen to fix modules build The LLVM_ENABLE_MODULES builds currently randomly fail due depending on the headers generated by the intrinsics_gen target, but the current dependency only model the non-modules dependencies: ``` While building module 'LLVM_ExecutionEngine' imported from llvm-project/llvm/lib/ExecutionEngine/Orc/Shared/TargetProcessControlTypes.cpp:13: While building module 'LLVM_intrinsic_gen' imported from llvm-project/llvm/include/llvm/ExecutionEngine/Orc/ThreadSafeModule.h:17: In file included from <module-includes>:1: In file included from llvm-project/llvm/include/llvm/IR/Argument.h:18: llvm/include/llvm/IR/Attributes.h:75:14: fatal error: 'llvm/IR/Attributes.inc' file not found #include "llvm/IR/Attributes.inc" ^~~~~~~~~~~~~~~~~~~~~~~~ ``` Depending on whether intrinsics_gen runs before compiling Orc/Shared files we either fail or include an outdated Attributes.inc in module builds. The Clang modules require these additional dependencies as including/importing one module requires all includes headers by that module to be parsable. Differential Revision: https://reviews.llvm.org/D92873 Added: Modified: llvm/lib/ExecutionEngine/Orc/Shared/CMakeLists.txt Removed: ################################################################################ diff --git a/llvm/lib/ExecutionEngine/Orc/Shared/CMakeLists.txt b/llvm/lib/ExecutionEngine/Orc/Shared/CMakeLists.txt index 808408c0e5df..62da0c71fb3f 100644 --- a/llvm/lib/ExecutionEngine/Orc/Shared/CMakeLists.txt +++ b/llvm/lib/ExecutionEngine/Orc/Shared/CMakeLists.txt @@ -5,6 +5,9 @@ add_llvm_component_library(LLVMOrcShared ADDITIONAL_HEADER_DIRS ${LLVM_MAIN_INCLUDE_DIR}/llvm/ExecutionEngine/Orc + DEPENDS + intrinsics_gen + LINK_COMPONENTS Support ) _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits