Fix executorch_no_prim_ops_shared linkage.

CMakeLists.txt

@@ -485,24 +485,26 @@ if(MAX_KERNEL_NUM)
   )
 endif()
 
-# shared version
-add_library(
-  executorch_no_prim_ops_shared SHARED ${_executorch_no_prim_ops__srcs}
-)
-target_link_libraries(executorch_no_prim_ops_shared PRIVATE program_schema)
-if(DL_LIBRARY_EXISTS)
-  target_link_libraries(executorch_no_prim_ops_shared PRIVATE dl) # For dladdr()
-endif()
-target_include_directories(
-  executorch_no_prim_ops_shared PUBLIC ${_common_include_directories}
-)
-target_compile_options(
-  executorch_no_prim_ops_shared PUBLIC ${_common_compile_options}
-)
-if(MAX_KERNEL_NUM)
-  target_compile_definitions(
-    executorch_no_prim_ops_shared PRIVATE MAX_KERNEL_NUM=${MAX_KERNEL_NUM}
+if(EXECUTORCH_BUILD_PYBIND)
+  # shared version
+  add_library(
+    executorch_no_prim_ops_shared SHARED ${_executorch_no_prim_ops__srcs}
+  )
+  target_link_libraries(executorch_no_prim_ops_shared PRIVATE program_schema)
+  if(DL_LIBRARY_EXISTS)
+    target_link_libraries(executorch_no_prim_ops_shared PRIVATE dl) # For dladdr()
+  endif()
+  target_include_directories(
+    executorch_no_prim_ops_shared PUBLIC ${_common_include_directories}
+  )
+  target_compile_options(
+    executorch_no_prim_ops_shared PUBLIC ${_common_compile_options}
   )
+  if(MAX_KERNEL_NUM)
+    target_compile_definitions(
+      executorch_no_prim_ops_shared PRIVATE MAX_KERNEL_NUM=${MAX_KERNEL_NUM}
+    )
+  endif()
 endif()
 
 #
@@ -553,7 +555,7 @@ endif()
 # Install `executorch` library as well as `executorch-config.cmake` under
 # ${CMAKE_INSTALL_PREFIX}/
 install(
-  TARGETS executorch executorch_no_prim_ops executorch_no_prim_ops_shared
+  TARGETS executorch executorch_no_prim_ops
   DESTINATION lib
   INCLUDES
   DESTINATION ${_common_include_directories}

build/Codegen.cmake

@@ -150,7 +150,7 @@ function(gen_custom_ops_aot_lib)
   include(${EXECUTORCH_ROOT}/build/Utils.cmake)
 
   target_link_options_shared_lib(${GEN_LIB_NAME})
-  if(APPLE)
+  if(EXECUTORCH_BUILD_PYBIND)
     target_link_libraries(${GEN_LIB_NAME} PRIVATE executorch_no_prim_ops_shared)
     target_link_options(${GEN_LIB_NAME} PRIVATE -undefined dynamic_lookup)
   else()

build/executorch-config.cmake

@@ -13,9 +13,7 @@
 cmake_minimum_required(VERSION 3.19)
 
 set(_root "${CMAKE_CURRENT_LIST_DIR}/../..")
-set(required_lib_list executorch executorch_no_prim_ops
-                      executorch_no_prim_ops_shared portable_kernels
-)
+set(required_lib_list executorch executorch_no_prim_ops portable_kernels)
 foreach(lib ${required_lib_list})
   set(lib_var "LIB_${lib}")
   add_library(${lib} STATIC IMPORTED)

examples/portable/custom_ops/test_custom_ops.sh

@@ -103,7 +103,7 @@ test_cmake_custom_op_2() {
 
   EXT=$(get_shared_lib_ext)
   echo "Exporting ${model_name}.pte"
-  DYLD_LIBRARY_PATH="cmake-out/lib" ${PYTHON_EXECUTABLE} -m "examples.portable.custom_ops.${model_name}" --so_library="cmake-out/examples/portable/custom_ops/libcustom_ops_aot_lib$EXT"
+  ${PYTHON_EXECUTABLE} -m "examples.portable.custom_ops.${model_name}" --so_library="cmake-out/examples/portable/custom_ops/libcustom_ops_aot_lib$EXT"
   # should save file custom_ops_2.pte
 
   echo 'Running custom_ops_executor_runner'