[PATCH] D74866: [MLIR] Workaround for broken dependencies with building libMLIR.so

[Stephen Neuendorffer via Phabricator via llvm-commits]

stephenneuendorffer created this revision.
Herald added subscribers: llvm-commits, Joonsoo, liufengdb, lucyrfox, mgester, arpith-jacob, nicolasvasilache, antiagainst, shauheen, burmako, jpienaar, rriddle, mehdi_amini, mgorny.
Herald added a project: LLVM.
stephenneuendorffer added a child revision: D74867: [MLIR] add out of tree version of mlir-opt.

add_dependencies needs to move to DEPENDS tag

Depends on D74865 <https://reviews.llvm.org/D74865>


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D74866

Files:
  mlir/cmake/modules/AddMLIR.cmake
  mlir/tools/mlir-shlib/CMakeLists.txt


Index: mlir/tools/mlir-shlib/CMakeLists.txt
===================================================================
--- mlir/tools/mlir-shlib/CMakeLists.txt
+++ mlir/tools/mlir-shlib/CMakeLists.txt
@@ -17,7 +17,7 @@
     # linking the static libraries instead.
     list(APPEND _DEPS "-force_load" ${lib})
   else()
-    list(APPEND _OBJECTS $<TARGET_OBJECTS:obj.${lib}>)
+    list(APPEND _OBJECTS $<TARGET_OBJECTS:${lib}>)
   endif()
   list(APPEND _DEPS $<TARGET_PROPERTY:${lib},LINK_LIBRARIES>)
 endforeach ()
Index: mlir/cmake/modules/AddMLIR.cmake
===================================================================
--- mlir/cmake/modules/AddMLIR.cmake
+++ mlir/cmake/modules/AddMLIR.cmake
@@ -44,10 +44,10 @@
     else()
       set(LIBTYPE STATIC)
     endif()
-    if(NOT XCODE)
-      # The Xcode generator doesn't handle object libraries correctly.
-      list(APPEND LIBTYPE OBJECT)
-    endif()
+    # if(NOT XCODE)
+    #   # The Xcode generator doesn't handle object libraries correctly.
+    #   list(APPEND LIBTYPE OBJECT)
+    # endif()
     set_property(GLOBAL APPEND PROPERTY MLIR_STATIC_LIBS ${name})
   endif()
   add_llvm_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} ${srcs})


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D74866.245504.patch
Type: text/x-patch
Size: 1201 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200219/897c8be8/attachment.bin>