Merge pull request #29911 from compnerd/pythonkit-new-compiler

build: build PythonKit with just built toolchain

Author: compnerd

utils/swift_build_support/swift_build_support/products/pythonkit.py

@@ -10,8 +10,11 @@
 #
 # ----------------------------------------------------------------------------
 
+import os
+
 from . import product
 from .. import shell
+from .. import targets
 
 
 class PythonKit(product.Product):
@@ -27,14 +30,18 @@ def should_build(self, host_target):
         return True
 
     def build(self, host_target):
+        toolchain_path = targets.toolchain_path(self.args.install_destdir,
+                                                self.args.install_prefix)
+        swiftc = os.path.join(toolchain_path, 'usr', 'bin', 'swift')
+
         shell.call([
             self.toolchain.cmake,
             '-G', 'Ninja',
             '-D', 'BUILD_SHARED_LIBS=YES',
             '-D', 'CMAKE_INSTALL_PREFIX={}/usr'.format(
                 self.args.install_destdir),
             '-D', 'CMAKE_MAKE_PROGRAM={}'.format(self.toolchain.ninja),
-            '-D', 'CMAKE_Swift_COMPILER={}'.format(self.toolchain.swiftc),
+            '-D', 'CMAKE_Swift_COMPILER={}'.format(swiftc),
             '-B', self.build_dir,
             '-S', self.source_dir,
         ])