Merge pull request #82924 from finagolfin/cmake

[build] Fix libcurl and cross-compiling corelibs

Author: finagolfin

utils/build-script-impl

@@ -827,6 +827,12 @@ function set_build_options_for_host() {
     # and it must be the same for both LLVM and Swift
 
     if [[ "${SWIFT_HOST_TRIPLE}" ]] ; then
+        # Adding this until we can configure these corelibs repos with a CMake
+        # toolchain file
+        SWIFT_TARGET_CMAKE_OPTIONS+=(
+            -DCMAKE_Swift_COMPILER_TARGET:STRING="${SWIFT_HOST_TRIPLE}"
+        )
+
         llvm_cmake_options+=(
             -DLLVM_HOST_TRIPLE:STRING="${SWIFT_HOST_TRIPLE}"
         )

utils/swift_build_support/swift_build_support/products/curl.py

@@ -114,13 +114,13 @@ def build(self, host_target):
         self.cmake_options.define('ENABLE_UNIX_SOCKETS', 'NO')
         self.cmake_options.define('ENABLE_THREADED_RESOLVER', 'NO')
         self.cmake_options.define('USE_ECH', 'NO')
-        self.cmake_options.deifne('USE_HTTPSRR', 'NO')
-        self.cmake_options.deifne('USE_OPENSSL_QUIC', 'NO')
+        self.cmake_options.define('USE_HTTPSRR', 'NO')
+        self.cmake_options.define('USE_OPENSSL_QUIC', 'NO')
 
         self.generate_toolchain_file_for_darwin_or_linux(host_target)
 
         if self.args.build_zlib:
             # If we're building zlib, make cmake search in the built toolchain
             toolchain_path = self.host_install_destdir(host_target)
             self.cmake_options.define('CMAKE_FIND_ROOT_PATH', toolchain_path)
-        self.build_with_cmake(['libcurl'], self.args.curl_build_variant, [])
+        self.build_with_cmake(['libcurl_static'], self.args.curl_build_variant, [])