Install swift-system into the toolchain during CMake build's install action
#953
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
swiftlang#915 added a CMake dependency on swift-system. Since then, the CMake build of the driver builds swift-system, but when the `install` action is triggered, the dependency's module and shared library are not installed into the toolchain. As a result, built toolchains are unable to invoke swift-driver due to the missing dylib. This ensures that much like other driver dependencies (TSC, ArgumentParser), we also install SwiftSystem. Resolves rdar://86754758
|
@swift-ci please test |
tomerd
approved these changes
Dec 21, 2021
compnerd
reviewed
Dec 21, 2021
| # swift-tools-support-core: TSCUtility.swiftmodule, TSCLibc.swiftmodule, TSCBasic.swiftmodule | ||
| # swift-argument-parser: ArgumentParser.swiftmodule (disabled until needed) | ||
| # swift-system: SystemPackage.swiftmodule |
There was a problem hiding this comment.
Why is the swiftmodule required? Do you expect to be building against the installed version of swift-driver?
There was a problem hiding this comment.
Potential clients of libSwiftDriver would need it if they try to use the toolchain's driver library instead of depending on it as a package.
There was a problem hiding this comment.
I think its an interesting question to understand who such clients are and if static vs dynamic linking of the dependencies is the right strategy.
There was a problem hiding this comment.
for now 👍 to unblock the nightly toolchain tho
| @@ -333,10 +334,17 @@ def install_libraries(args, build_dir, universal_lib_dir, toolchain_lib_dir, tar | |||
| install_library(args, build_dir, package_subpath, lib, | |||
| universal_lib_dir, toolchain_lib_dir, 'swift-tools-support-core', targets) | |||
|
|
|||
| # Instal the swift-system shared library into the toolchain lib | |||
There was a problem hiding this comment.
Typo copied 3 times: instal
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.
#915 added a CMake dependency on swift-system.
Since then, the CMake build of the driver builds swift-system, but when the
installaction is triggered, the dependency's module and shared library are not installed into the toolchain. As a result, built toolchains are unable to invoke swift-driver due to the missing dylib.This ensures that much like other driver dependencies (TSC, ArgumentParser), we also install SwiftSystem.
Resolves rdar://86754758