[build] Switch get_install_destdir() and other duplicated logic to the new host_install_destdir()

Author: finagolfin

utils/swift_build_support/swift_build_support/products/benchmarks.py

@@ -104,9 +104,7 @@ def _get_toolchain_path(host_target, product, args):
     # this logic initially was inside run_build_script_helper
     # and was factored out so it can be used in testing as well
 
-    toolchain_path = swiftpm.SwiftPM.get_install_destdir(args,
-                                                         host_target,
-                                                         product.build_dir)
+    toolchain_path = product.host_install_destdir(host_target)
     if platform.system() == 'Darwin':
         # The prefix is an absolute path, so concatenate without os.path.
         toolchain_path += \

utils/swift_build_support/swift_build_support/products/indexstoredb.py

@@ -80,11 +80,7 @@ def run_build_script_helper(action, host_target, product, args,
     script_path = os.path.join(
         product.source_dir, 'Utilities', 'build-script-helper.py')
 
-    install_destdir = args.install_destdir
-    if swiftpm.SwiftPM.has_cross_compile_hosts(args):
-        install_destdir = swiftpm.SwiftPM.get_install_destdir(args,
-                                                              host_target,
-                                                              product.build_dir)
+    install_destdir = product.host_install_destdir(host_target)
     toolchain_path = product.native_toolchain_path(host_target)
     is_release = product.is_release()
     configuration = 'release' if is_release else 'debug'

utils/swift_build_support/swift_build_support/products/product.py

@@ -200,9 +200,7 @@ def install_toolchain_path(self, host_target):
         install_destdir = self.args.install_destdir
         if self.args.cross_compile_hosts:
             if self.is_darwin_host(host_target):
-                build_root = os.path.dirname(self.build_dir)
-                install_destdir = '%s/intermediate-install/%s' % (build_root,
-                                                                  host_target)
+                install_destdir = self.host_install_destdir(host_target)
             else:
                 install_destdir = os.path.join(install_destdir, self.args.host_target)
         return targets.toolchain_path(install_destdir,

utils/swift_build_support/swift_build_support/products/skstresstester.py

@@ -100,9 +100,7 @@ def should_install(self, host_target):
         return self.args.install_skstresstester
 
     def install(self, host_target):
-        install_destdir = swiftpm.SwiftPM.get_install_destdir(self.args,
-                                                              host_target,
-                                                              self.build_dir)
+        install_destdir = self.host_install_destdir(host_target)
         install_prefix = install_destdir + self.args.install_prefix
         self.run_build_script_helper('install', host_target, [
             '--prefix', install_prefix

utils/swift_build_support/swift_build_support/products/swiftdriver.py

@@ -86,11 +86,7 @@ def run_build_script_helper(action, host_target, product, args):
     script_path = os.path.join(
         product.source_dir, 'Utilities', 'build-script-helper.py')
 
-    install_destdir = args.install_destdir
-    if swiftpm.SwiftPM.has_cross_compile_hosts(args):
-        install_destdir = swiftpm.SwiftPM.get_install_destdir(args,
-                                                              host_target,
-                                                              product.build_dir)
+    install_destdir = product.host_install_destdir(host_target)
     toolchain_path = product.native_toolchain_path(host_target)
 
     # Pass Dispatch directory down if we built it

utils/swift_build_support/swift_build_support/products/swiftpm.py

@@ -101,8 +101,8 @@ def run_bootstrap_script(self, action, host_target, additional_params=[]):
             elif self.is_cross_compile_target(host_target):
                 helper_cmd += ['--cross-compile-hosts', host_target,
                                '--skip-cmake-bootstrap']
-                build_toolchain_path = self.get_install_destdir(
-                    self.args, host_target, self.build_dir) + self.args.install_prefix
+                build_toolchain_path = self.host_install_destdir(
+                    host_target) + self.args.install_prefix
                 resource_dir = '%s/lib/swift' % build_toolchain_path
                 helper_cmd += [
                     '--cross-compile-config',
@@ -137,22 +137,8 @@ def should_install(self, host_target):
     def has_cross_compile_hosts(self, args):
         return args.cross_compile_hosts
 
-    @classmethod
-    def get_install_destdir(self, args, host_target, build_dir):
-        install_destdir = args.install_destdir
-        if self.has_cross_compile_hosts(args):
-            if self.is_darwin_host(self, host_target):
-                build_root = os.path.dirname(build_dir)
-                install_destdir = '%s/intermediate-install/%s' % (
-                                  build_root, host_target)
-            else:
-                install_destdir = os.path.join(install_destdir, host_target)
-        return install_destdir
-
     def install(self, host_target):
-        install_destdir = self.get_install_destdir(self.args,
-                                                   host_target,
-                                                   self.build_dir)
+        install_destdir = self.host_install_destdir(host_target)
         install_prefix = install_destdir + self.args.install_prefix
 
         self.run_bootstrap_script('install', host_target, [