Merge pull request #3014 from Baiyuetribe/master

fix apple static build error
alibaba · Sep 3, 2024 · a8b7997 · a8b7997
2 parents d7e7a5e + 4bdce52
commit a8b7997
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -771,7 +771,11 @@ if (NOT MNN_BUILD_SHARED_LIBS)
         if(CMAKE_SYSTEM_NAME MATCHES "^Linux")
             set(MNN_DEPS -Wl,--whole-archive ${MNN_DEPS} -lpthread -Wl,--no-whole-archive)
         else()
+          if(APPLE)
+            set(MNN_DEPS -Wl,-force_load ${MNN_DEPS})
+          else()
             set(MNN_DEPS -Wl,--whole-archive ${MNN_DEPS} -Wl,--no-whole-archive)
+          endif()
         endif()
     endif()
 endif()

diff --git a/tools/converter/CMakeLists.txt b/tools/converter/CMakeLists.txt
@@ -51,7 +51,7 @@ IF(MNN_BUILD_CONVERTER)
         target_link_libraries(MNNConvertDeps PUBLIC ${TORCH_LIBRARIES})
     endif()
     if(APPLE)
-        target_link_libraries(MNNConvert -Wl,-all_load MNNConvertDeps ${MNN_DEPS} -Wl,-noall_load)
+        target_link_libraries(MNNConvert -Wl,-all_load MNNConvertDeps ${MNN_DEPS})
     elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         # See also /path/to/MNN/CMakeLists.txt:481 when you are confused with -lpthread here.
         target_link_libraries(MNNConvert -Wl,--whole-archive MNNConvertDeps ${MNN_DEPS} -lpthread -Wl,--no-whole-archive)