[Runtimes] lay down nested swift modules ahead of CMake 4.1 #82571
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
edymtt commented Jun 27, 2025
There was a problem hiding this comment.
Suggested change
| "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-module-path ${CMAKE_CURRENT_BINARY_DIR}/${module_name}.swiftmodule/${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftmodule>") | |
| "$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-module-path ${CMAKE_CURRENT_BINARY_DIR}/${module_name}.swiftmodule/${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftmodule>") |
edymtt commented Jun 27, 2025
There was a problem hiding this comment.
Suggested change
| to ensure if behaves as expected | |
| to ensure it behaves as expected |
edymtt force-pushed the edymtt/nested-swiftmodule-structure-before-cmake-4.1 branch from aad3856 to 33f228a Compare edymtt changed the title | @swift-ci please test |
edymtt requested review from compnerd, etcwilde and justice-adams-apple as code owners edymtt commented Jun 27, 2025
There was a problem hiding this comment.
etcwilde reviewed Jun 27, 2025
This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
edymtt force-pushed the edymtt/nested-swiftmodule-structure-before-cmake-4.1 branch from 33f228a to 07f9a31 Compare | @swift-ci please test |
etcwilde approved these changes Jun 27, 2025
There was a problem hiding this comment.
LGTM as far as I can tell. Should check with @compnerd as there may be associated changes needed in the swift-installer-scripts repo.
| @swift-ci please smoke test macOS |
| @swift-ci please test macOS |
| @swift-ci please build toolchain Windows |
edymtt commented Jun 30, 2025
edymtt commented Jun 30, 2025
This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
… 4.1 This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 Addresses rdar://154410676
edymtt force-pushed the edymtt/nested-swiftmodule-structure-before-cmake-4.1 branch from 07f9a31 to 111cfe2 Compare | @swift-ci please smoke test macOS |
| @swift-ci please test macOS |
| @swift-ci please test Linux |
| @swift-ci please build toolchain Windows |
| @swift-ci please test Windows |
edymtt added a commit to edymtt/swift that referenced this pull request Jun 30, 2025
Trying to figure out a failure in swiftlang#82571 https://ci-external.swift.org/job/swift-PR-build-toolchain-windows/5941/
| Still need to cross reference with the installer scripts, but looking at the logs for the build of the Windows toolchain and perusing some local build results, it seems that the installation of experimental products is generating the existing files at the same location, and adding @@ -1,11 +1,17 @@ -- Install configuration: "Release" -- Installing: T:/Program Files/Swift/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/x86_64/libswift_RegexParser.lib +-- Installing: T:/Program Files/Swift/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/_RegexParser.swiftmodule -- Installing: T:/Program Files/Swift/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/_RegexParser.swiftmodule/x86_64-unknown-windows-msvc.swiftdoc -- Installing: T:/Program Files/Swift/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/_RegexParser.swiftmodule/x86_64-unknown-windows-msvc.swiftmodule +-- Installing: T:/Program Files/Swift/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/_RegexParser.swiftmodule/x86_64-unknown-windows-msvc.swiftsourceinfo -- Installing: T:/Program Files/Swift/Platforms/Windows.platform/Developer/SDKs/WindowsExperimental.sdk/usr/lib/swift_static/windows/x86_64/libswift_StringProcessing.lib |
| All the phases that target for |
compnerd approved these changes Jul 1, 2025
edymtt added a commit to edymtt/swift that referenced this pull request Jul 9, 2025
Before swiftlang#82571, we would generate a binary swiftmodule file at `<build folder>/<module>.swiftmodule`, while now in the same location we generate a directory. Trying an incremental run on top of a build folder generated with the old logic will fail during configuration with an error similar to ``` CMake Error at .../Supplemental/cmake/modules/EmitSwiftInterface.cmake:21 (file): file failed to create directory: .../StringProcessing-build/_RegexParser/_RegexParser.swiftmodule because: File exists ``` To reduce churn in CI and at desk, delete such remnant from the previous logic. Addresses rdar://155466197
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants
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.
This is needed in order to build target variants properly with a SwiftDriver that has swiftlang/swift-driver#1856 enabled.
Addresses rdar://154410676