Update

[ghstack-poisoned]

Author: shoumikhin

backends/qualcomm/CMakeLists.txt

@@ -376,11 +376,15 @@ if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64|AMD64")
             qnn_schema
             qnn_manager
             qnn_executorch_header
-            extension_tensor
             qnn_backend_options
             wrappers
             qnn_executorch_logging
   )
+  # extension_tensor is bundled into the shared runtime, so naming it again here
+  # would give this module a second copy of what that library already provides.
+  if(NOT EXECUTORCH_BUILD_SHARED)
+    target_link_libraries(PyQnnManagerAdaptor PRIVATE extension_tensor)
+  endif()
   # Same reasoning as the delegate above: take the runtime from the shared
   # library when there is one, rather than embedding a second registry.
   if(EXECUTORCH_BUILD_SHARED)

tools/cmake/Utils.cmake

@@ -277,8 +277,10 @@ function(executorch_target_retain_shared_library target_name library_target)
   endif()
   if(APPLE OR MSVC)
     # TARGET_LINKER_FILE rather than TARGET_FILE: on Windows the linker needs
-    # the import library, not the DLL itself.
-    set(_retain_flags "SHELL:$<TARGET_LINKER_FILE:${library_target}>")
+    # the import library, not the DLL itself. Plain rather than SHELL: this is a
+    # single path, and SHELL splits on spaces, so a path containing one would
+    # reach the linker as two broken arguments.
+    set(_retain_flags "$<TARGET_LINKER_FILE:${library_target}>")
   else()
     # push-state/pop-state rather than closing with an explicit --as-needed:
     # that would leave --as-needed in force for everything after it on the line