Skip to content

Commit 2271e7a

Browse files
committed
wasmswiftsdk.py: build the generator with the freshly built toolchain
As Swift CI nodes use Swift 5.9 and Swift 5.10, and as of swiftlang/swift-sdk-generator#227 Swift SDK Generator is no longer tested with Swift 5.9 and 5.10, we should build it with the freshly built toolchain. This will also unblock bump of `swift-tools-version` to 6.0 in the generator's package swiftlang/swift-sdk-generator#237
1 parent 3d3331f commit 2271e7a

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

utils/swift_build_support/swift_build_support/products/wasmswiftsdk.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,7 @@ def build(self, host_target):
279279
if build_sdk:
280280
target_packages.append((swift_host_triple, wasi_sysroot, package_path))
281281

282-
swiftc_path = os.path.abspath(self.toolchain.swiftc)
283-
toolchain_path = os.path.dirname(os.path.dirname(swiftc_path))
284-
swift_run = os.path.join(toolchain_path, 'bin', 'swift-run')
282+
swift_run = os.path.join(self.install_toolchain_path(host_target), "bin", "swift-run")
285283

286284
swift_version = os.environ.get('TOOLCHAIN_VERSION',
287285
'swift-DEVELOPMENT-SNAPSHOT')

0 commit comments

Comments
 (0)