[PATCH] D132138: Revert "[FindGRPC.cmake] Use `llvm_add_library()` for the custom proto target instead of `add_llvm_library()`"

Argyrios Kyrtzidis via Phabricator via llvm-commits llvm-commits at lists.llvm.org
Thu Aug 18 08:20:25 PDT 2022


akyrtzi created this revision.
Herald added subscribers: kadircet, mgorny.
Herald added a project: All.
akyrtzi requested review of this revision.
Herald added subscribers: llvm-commits, ilya-biryukov.
Herald added a project: LLVM.

Breaks configuring `clangd` with `-DCLANGD_ENABLE_REMOTE=On` (https://github.com/llvm/llvm-project/issues/57213)

This reverts commit ba688024077c3e51c6a0949246b2a1b76284e681 <https://reviews.llvm.org/rGba688024077c3e51c6a0949246b2a1b76284e681>.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D132138

Files:
  llvm/cmake/modules/FindGRPC.cmake


Index: llvm/cmake/modules/FindGRPC.cmake
===================================================================
--- llvm/cmake/modules/FindGRPC.cmake
+++ llvm/cmake/modules/FindGRPC.cmake
@@ -132,12 +132,7 @@
         ARGS ${Flags} "${ProtoSourceAbsolutePath}"
         DEPENDS "${ProtoSourceAbsolutePath}")
 
-  set(LIBTYPE STATIC)
-  if(NOT XCODE)
-    # The Xcode generator doesn't handle object libraries correctly.
-    list(APPEND LIBTYPE OBJECT)
-  endif()
-  llvm_add_library(${LibraryName} ${LIBTYPE} ${GeneratedProtoSource}
+  add_llvm_library(${LibraryName} ${GeneratedProtoSource}
     PARTIAL_SOURCES_INTENDED
     LINK_LIBS PUBLIC grpc++ protobuf)
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D132138.453667.patch
Type: text/x-patch
Size: 661 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220818/a0edcb43/attachment.bin>


More information about the llvm-commits mailing list