[llvm] 815a3f5 - [CMake] Fix modules build after DWARFLinker reorganization

[Jonas Devlieghere via llvm-commits]

Author: Jonas Devlieghere
Date: 2020-01-10T11:06:38-08:00
New Revision: 815a3f54331c39f2b400776f448dd29b3b03243b

URL: https://github.com/llvm/llvm-project/commit/815a3f54331c39f2b400776f448dd29b3b03243b
DIFF: https://github.com/llvm/llvm-project/commit/815a3f54331c39f2b400776f448dd29b3b03243b.diff

LOG: [CMake] Fix modules build after DWARFLinker reorganization

Create a dedicate module for the DWARFLinker and make it depend on
intrinsics gen.

Added: 
    

Modified: 
    llvm/include/llvm/module.modulemap
    llvm/lib/DWARFLinker/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/include/llvm/module.modulemap b/llvm/include/llvm/module.modulemap
index 25799b64987a..05de40698e35 100644
--- a/llvm/include/llvm/module.modulemap
+++ b/llvm/include/llvm/module.modulemap
@@ -152,6 +152,13 @@ module LLVM_DebugInfo_CodeView {
   textual header "DebugInfo/CodeView/CodeViewSymbols.def"
 }
 
+module LLVM_DWARFLinker {
+  requires cplusplus
+
+  umbrella "DWARFLinker"
+  module * { export * }
+}
+
 module LLVM_ExecutionEngine {
   requires cplusplus
 

diff  --git a/llvm/lib/DWARFLinker/CMakeLists.txt b/llvm/lib/DWARFLinker/CMakeLists.txt
index 09610f006fdb..f8c613366409 100644
--- a/llvm/lib/DWARFLinker/CMakeLists.txt
+++ b/llvm/lib/DWARFLinker/CMakeLists.txt
@@ -3,4 +3,6 @@ add_llvm_component_library(LLVMDWARFLinker
   DWARFLinkerDeclContext.cpp
   DWARFLinker.cpp
 
+  DEPENDS
+  intrinsics_gen
   )