-
Notifications
You must be signed in to change notification settings - Fork 10.5k
Copy WasmKit to host_install_destdir
#81178
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
This enables `swift run` and `swift test` to use WasmKit when cross-compiling to Wasm with Swift SDKs that have toolsets pointing to WasmKit.
@swift-ci build toolchain |
@swift-ci build toolchain |
@swift-ci smoke test |
@@ -1346,6 +1346,7 @@ playgroundsupport | |||
indexstore-db | |||
sourcekit-lsp | |||
swiftdocc | |||
wasmkit |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How much time does this add?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
16:57:25 Build Percentage Build Duration (sec) Build Phase
16:57:25 ================ ==================== ===========
16:57:25 0.3% 67.98 Building wasmkit
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Installation takes less than a second.
Also need to build and install for Windows (though install isn't in this repo)
@swift-ci build toolchain |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently WasmKit CLI is built using Swift toolchain already installed on the host, not the just-built one. So it's linked with the host libswiftCore.so now, but we should build it with the just-built toolchain to make it use toolchain-local libswiftCore.so instead.
@swift-ci test |
@swift-ci build toolchain |
@swift-ci build toolchain linux |
@swift-ci test linux |
install_destdir
self.host_install_destdir
self.host_install_destdir
host_install_destdir
Linux failures are legit with rpath not set correctly for WasmKit, addressing that... |
@swift-ci test |
@swift-ci build toolchain |
6.2: Copy WasmKit to `host_install_destdir` Cherry-pick of #81178, merged as eac419b **Explanation**: This enables `swift run` and `swift test` to use WasmKit when cross-compiling to Wasm with Swift SDKs that have toolsets pointing to WasmKit. **Scope**: limited to swift.org toolchains and a single WasmKit product. No other build products are changed. **Risk**: low, the change is additive and doesn't impact anything other than this single product. **Testing**: automated testing via github.com/swiftlang/swift-integration-tests **Issue**: rdar://150382758 **Reviewer**: @bnbarham
This enables
swift run
andswift test
to use WasmKit when cross-compiling to Wasm with Swift SDKs that have toolsets pointing to WasmKit.rdar://150382758