Build WasmKit with the freshly-built SwiftPM

Author: MaxDesiatov

utils/swift_build_support/swift_build_support/build_script_invocation.py

@@ -672,6 +672,14 @@ def compute_product_pipelines(self):
                             is_enabled=self.args.build_wasmstdlib)
         builder.add_product(products.WasmThreadsLLVMRuntimeLibs,
                             is_enabled=self.args.build_wasmstdlib)
+
+        builder.add_product(products.SwiftTestingMacros,
+                            is_enabled=self.args.build_swift_testing_macros)
+        builder.add_product(products.SwiftTesting,
+                            is_enabled=self.args.build_swift_testing)
+        builder.add_product(products.SwiftPM,
+                            is_enabled=self.args.build_swiftpm)
+
         builder.add_product(products.WasmKit,
                             is_enabled=self.args.build_wasmkit)
         builder.add_product(products.WasmStdlib,
@@ -681,12 +689,6 @@ def compute_product_pipelines(self):
         builder.add_product(products.WasmSwiftSDK,
                             is_enabled=self.args.build_wasmstdlib)
 
-        builder.add_product(products.SwiftTestingMacros,
-                            is_enabled=self.args.build_swift_testing_macros)
-        builder.add_product(products.SwiftTesting,
-                            is_enabled=self.args.build_swift_testing)
-        builder.add_product(products.SwiftPM,
-                            is_enabled=self.args.build_swiftpm)
         builder.add_product(products.SwiftFoundationTests,
                             is_enabled=self.args.build_foundation)
         builder.add_product(products.FoundationTests,

utils/swift_build_support/swift_build_support/products/wasmkit.py

@@ -14,6 +14,7 @@
 import shutil
 
 from . import product
+from . import swiftpm
 from .. import shell
 
 
@@ -37,7 +38,7 @@ def is_before_build_script_impl_product(cls):
 
     @classmethod
     def get_dependencies(cls):
-        return []
+        return [swiftpm.SwiftPM]
 
     def should_build(self, host_target):
         return self.args.build_wasmkit
@@ -72,10 +73,8 @@ def cli_file_path(cls, build_dir):
 
 
 def run_swift_build(host_target, product, swpft_package_product_name):
-    # Building with the host toolchain's SwiftPM
-    swiftc_path = os.path.abspath(product.toolchain.swiftc)
-    toolchain_path = os.path.dirname(os.path.dirname(swiftc_path))
-    swift_build = os.path.join(toolchain_path, 'bin', 'swift-build')
+    # Building with the freshly-built SwiftPM
+    swift_build = os.path.join(product.install_toolchain_path(host_target), "bin", "swift-build")
 
     build_args = [
         swift_build,