Generate Clang module maps during the build #6983
Merged
Conversation
This file contains 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
|
@swift-ci please smoke test |
|
@swift-ci please test |
CMake build needs adjusting. |
neonichu
force-pushed
the
module-map-generation
branch
from
d063c9a
to
8126a3f
Compare
|
@swift-ci please test |
|
@swift-ci please test windows |
1 similar comment
|
@swift-ci please test windows |
This looks relevant |
MaxDesiatov
reviewed
Oct 10, 2023
MaxDesiatov
reviewed
Oct 10, 2023
|
Ah I think I understand the problem: we previously relied on module maps to always be present to allow compilation of dependent targets, but now we actually need to add a dependency on the module map generation in the dependent targets as well. This is somewhat more involved since the dependent targets do not (and should not) know whether their dependencies have generated module maps, so we need a way to depend on the generation without depending on a concrete file. I believe Xcode's build system has a "modules ready" gate task for that purpose, but we don't have any such concept so far in SwiftPM's build system. |
neonichu
force-pushed
the
module-map-generation
branch
from
8126a3f
to
f5d2c54
Compare
|
@swift-ci please test package compatibility |
Looks like infra failure? |
|
@swift-ci please test package compatibility |
|
Looks like this failed similar to the reverted changes from #6988, but this should be using main? |
|
@swift-ci please test package compatibility |
1 similar comment
|
@swift-ci please test package compatibility |
neonichu
force-pushed
the
module-map-generation
branch
from
f5d2c54
to
d210502
Compare
|
@swift-ci please test package compatibility |
|
@swift-ci please test |
|
Ah yes, need to update a few tests because the raw LLBuild manifest has changed. |
neonichu
force-pushed
the
module-map-generation
branch
2 times, most recently
from
de5a4d3
to
70715ef
Compare
|
@swift-ci please test |
|
@swift-ci please test windows |
|
@swift-ci please test package compatibility |
|
neonichu
force-pushed
the
module-map-generation
branch
from
70715ef
to
bd19ab7
Compare
|
@swift-ci please test |
|
@swift-ci please test windows |
|
@swift-ci please test package compatibility |
|
Looks like there's still a race here (most likely due to an unexpressed dependency on the generated module map): |
|
We're missing a dependency from Swift targets to the |
This moves generation of module maps for Clang targets into the build process.
neonichu
force-pushed
the
module-map-generation
branch
from
bd19ab7
to
75fc214
Compare
|
@swift-ci please test |
|
@swift-ci please test windows |
|
@swift-ci please test package compatibility |
|
Also cc @m-i-r-z-a since this touches the build system. |
|
@swift-ci please test package compatibility |
tomerd
approved these changes
Oct 30, 2023
It's quite difficult for tests to discover issues with this since the more tricky mistakes will just result in a race which the typical small test case will almost always win. Even with compatibility test suite plus toolchain build, the missing dependency in Swift tasks only showed up once in several builds. So I wouldn't say it's enough, but I also don't have any concrete ideas on what to add. |
|
One failure that looks very much unrelated, it's a compiler crash: |
shahmishal
pushed a commit
that referenced
this pull request
Oct 31, 2023
Reverts #6983 We're seeing errors like ``` fatal error: module map file '/Users/ec2-user/jenkins/workspace/swift-PR-macos-smoke-test/branch-main/build/buildbot_incremental/swiftdriver-macosx-x86_64/x86_64-apple-macosx/release/llbuildBasic.build/module.modulemap' not found ``` on various CI jobs and should revert this to unblock.
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.
This moves generation of module maps for Clang targets into the build process.