[wasm] Repair build for recent SwiftDriver linkage changes #73746
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Before f34d388, the EarlySwiftDriver used Dispatch/Foundation from old host toolchain at the initial "build" step, and then re-linked the just built Dispatch/Foundation at "install" step. - WasmStdlib product incorrectly set `BOOTSTRAPPING_MODE` to `HOSTTOOLS` and it makes `SwiftSource.cmake` set `LD_LIBRARY_PATH` to load the Dispatch/Foundation from the just built toolchain (SWIFT_NATIVE_SWIFT_TOOLS_PATH). After f34d388, the EarlySwiftDriver always uses the corelibs of the old host toolchain, so setting `LD_LIBRARY_PATH` leads to loading incompatible corelibs of the old host toolchain, and the build fails. This change tells the CMake build system to use CROSSCOMPILE mode. We already built the toolchain for the current host from the revision being built for the target, so we don't need to inject the lib library of the old host toolchain.
|
@swift-ci test WebAssembly |
WASI does not support crashing tests
5298450 added @_used for the function and it added "R" flag (WASM_SEG_FLAG_RETAIN) to the section directive. This patch updates the test to match the new section flags.
The `classes-wasm.swift` test was the only executable test for WebAssembly that requires wasm runtime at test-time. Other tests in the `embedded` directory run only on the macOS / Linux host toolchain builds and some of them are incompatible with SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB=OFF. Given that the `classes-wasm.swift` test is the only test we want to run during WasmStdlib build, move it to a separate directory `embedded/wasm`.
|
@swift-ci test WebAssembly |
|
@swift-ci smoke test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
BOOTSTRAPPING_MODEtoHOSTTOOLSand it makesSwiftSource.cmakesetLD_LIBRARY_PATHto load the Dispatch/Foundation from the just built toolchain (SWIFT_NATIVE_SWIFT_TOOLS_PATH).After f34d388, the EarlySwiftDriver always uses the corelibs of the old host toolchain, so setting
LD_LIBRARY_PATHleads to loading incompatible corelibs of the old host toolchain, and the build fails.This change tells the CMake build system to use CROSSCOMPILE mode. We already built the toolchain for the current host from the revision being built for the target, so we don't need to inject the lib library of the old host toolchain.
This patch fixes the following CI failure:
https://ci.swift.org/job/oss-swift-pr-test-crosscompile-wasm-ubuntu-20_04/681/console
/home/build-user/swift-nightly-install/usr/bin/swiftc: symbol lookup error: /home/build-user/build/buildbot_linux/earlyswiftdriver-linux-x86_64/release/dependencies/swift-tools-support-core/lib/libTSCBasic.so: undefined symbol: $s8Dispatch0A5QueueC5async5group3qos5flags7executeyAA0A5GroupCSg_AA0A3QoSVAA0A13WorkItemFlagsVyyXBtF