Merge pull request #33129 from davezarzycki/pr33129

davezarzycki · web-flow · commit 8a45c9c62f20 · 2020-07-27T11:24:19.000-04:00
[CMake] BUILD_SHARED_LIBS fixes
diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt
@@ -5,7 +5,7 @@ else()
   set(SWIFTAST_LLVM_LINK_COMPONENTS
     bitreader bitwriter coroutines coverage irreader debuginfoDWARF
     profiledata instrumentation object objcarcopts mc mcparser
-    bitreader bitwriter lto ipo option core support ${LLVM_TARGETS_TO_BUILD}
+    bitreader bitwriter lto ipo option core support remarks ${LLVM_TARGETS_TO_BUILD}
   )
 endif()
 
diff --git a/lib/ClangImporter/CMakeLists.txt b/lib/ClangImporter/CMakeLists.txt
@@ -24,6 +24,7 @@ add_swift_host_library(swiftClangImporter STATIC
 target_link_libraries(swiftClangImporter PRIVATE
   swiftAST
   swiftParse
+  clangTooling
   LLVMBitstreamReader)
 
 target_link_libraries(swiftClangImporter INTERFACE

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ else()`
`5`	`5`	`set(SWIFTAST_LLVM_LINK_COMPONENTS`
`6`	`6`	`bitreader bitwriter coroutines coverage irreader debuginfoDWARF`
`7`	`7`	`profiledata instrumentation object objcarcopts mc mcparser`
`8`		`- bitreader bitwriter lto ipo option core support ${LLVM_TARGETS_TO_BUILD}`
	`8`	`+ bitreader bitwriter lto ipo option core support remarks ${LLVM_TARGETS_TO_BUILD}`
`9`	`9`	`)`
`10`	`10`	`endif()`
`11`	`11`