swift_build_support: renamegenerate_toolchain_file

Author: MaxDesiatov

utils/swift_build_support/swift_build_support/products/cmark.py

@@ -54,7 +54,7 @@ def build(self, host_target):
 
         self.cmake_options.define('CMARK_THREADING', 'ON')
 
-        host_toolchain = self.generate_toolchain_file(host_target)
+        host_toolchain = self.generate_toolchain_file_for_darwin_or_linux(host_target)
 
         (platform, _) = host_target.split('-')
         if not host_toolchain and platform == "openbsd":

utils/swift_build_support/swift_build_support/products/curl.py

@@ -109,7 +109,7 @@ def build(self, host_target):
         self.cmake_options.define('ENABLE_UNIX_SOCKETS', 'NO')
         self.cmake_options.define('ENABLE_THREADED_RESOLVER', 'NO')
 
-        self.generate_toolchain_file(host_target)
+        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

utils/swift_build_support/swift_build_support/products/earlyswiftsyntax.py

@@ -51,7 +51,7 @@ def build(self, host_target):
                                   self.args.swift_build_variant)
         self.cmake_options.define('BUILD_SHARED_LIBS:STRING', 'NO')
 
-        self.generate_toolchain_file(host_target)
+        self.generate_toolchain_file_for_darwin_or_linux(host_target)
 
         self.build_with_cmake(["all"], self.args.swift_build_variant, [])
 

utils/swift_build_support/swift_build_support/products/libxml2.py

@@ -85,5 +85,5 @@ def build(self, host_target):
         self.cmake_options.define('LIBXML2_WITH_TESTS', 'NO')
         self.cmake_options.define('LIBXML2_WITH_ZLIB', 'NO')
 
-        self.generate_toolchain_file(host_target)
+        self.generate_toolchain_file_for_darwin_or_linux(host_target)
         self.build_with_cmake(["LibXml2"], self.args.libxml2_build_variant, [])

utils/swift_build_support/swift_build_support/products/product.py

@@ -411,14 +411,16 @@ def generate_linux_toolchain_file(self, platform, arch):
 
         return toolchain_file
 
-    def generate_toolchain_file(self, host_target):
+    def generate_toolchain_file_for_darwin_or_linux(self, host_target):
         """
         Checks `host_target` platform and generates a new CMake tolchain file
-        appropriate for that target plaftorm. Defines `CMAKE_C_FLAGS` and
-        `CMAKE_CXX_FLAGS` as CMake options. Also defines `CMAKE_TOOLCHAIN_FILE`
-        with the path of the generated toolchain file as a CMake option.
+        appropriate for that target plaftorm (either Darwin or Linux). Defines
+        `CMAKE_C_FLAGS` and `CMAKE_CXX_FLAGS` as CMake options. Also defines
+        `CMAKE_TOOLCHAIN_FILE` with the path of the generated toolchain file
+        as a CMake option.
 
-            Returns: path to the newly generated toolchain file on the filesystem.
+            Returns: path to the newly generated toolchain file on the
+            filesystem.
         """
 
         (platform, arch) = host_target.split('-')

utils/swift_build_support/swift_build_support/products/zlib.py

@@ -81,5 +81,5 @@ def build(self, host_target):
         self.cmake_options.define('SKIP_INSTALL_FILES', 'YES')
         self.cmake_options.define('CMAKE_INSTALL_PREFIX', '/usr')
 
-        self.generate_toolchain_file(host_target)
+        self.generate_toolchain_file_for_darwin_or_linux(host_target)
         self.build_with_cmake(["all"], self.args.zlib_build_variant, [])