Merge pull request #19824 from compnerd/lipo

Author: swift-ci

CMakeLists.txt

@@ -448,13 +448,9 @@ include(SwiftList)
 swift_configure_components()
 
 # lipo is used to create universal binaries.
-if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-  include(SwiftDarwin)
-  if(SWIFT_LIPO)
-    set(LIPO ${SWIFT_LIPO})
-  else()
-    find_toolchain_tool(LIPO "${SWIFT_DARWIN_XCRUN_TOOLCHAIN}" lipo)
-  endif()
+include(SwiftToolchainUtils)
+if(NOT SWIFT_LIPO)
+  find_toolchain_tool(SWIFT_LIPO "${SWIFT_DARWIN_XCRUN_TOOLCHAIN}" lipo)
 endif()
 
 if("${SWIFT_NATIVE_LLVM_TOOLS_PATH}" STREQUAL "")

cmake/modules/AddSwift.cmake

@@ -548,7 +548,7 @@ function(_add_swift_lipo_target)
     endif()
     # Use lipo to create the final binary.
     add_custom_command_target(unused_var
-        COMMAND "${LIPO}" "-create" "-output" "${LIPO_OUTPUT}" ${source_binaries}
+        COMMAND "${SWIFT_LIPO}" "-create" "-output" "${LIPO_OUTPUT}" ${source_binaries}
         ${codesign_command}
         CUSTOM_TARGET_NAME "${LIPO_TARGET}"
         OUTPUT "${LIPO_OUTPUT}"

cmake/modules/StandaloneOverlay.cmake

@@ -32,11 +32,13 @@ list(APPEND CMAKE_MODULE_PATH
   ${LLVM_CMAKE_MODULES_PATH}
 )
 
-message(STATUS "FINDING LIPO")
-  execute_process(
-  COMMAND "xcrun" "-find" "lipo"
-  OUTPUT_VARIABLE LIPO
-  OUTPUT_STRIP_TRAILING_WHITESPACE)
+set(SWIFT_DARWIN_XCRUN_TOOLCHAIN "XcodeDefault" CACHE STRING
+    "The name of the toolchain to pass to 'xcrun'")
+
+include(SwiftToolchainUtils)
+if(NOT SWIFT_LIPO)
+  find_toolchain_tool(SWIFT_LIPO "${SWIFT_DARWIN_XCRUN_TOOLCHAIN}" lipo)
+endif()
 
 include(AddLLVM)
 include(SwiftUtils)