DependencyScanner: add a new extraPcmArgs field for each Swift module #32304
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
|
@swift-ci please smoke test |
artemcm
reviewed
Jun 11, 2020
artemcm
approved these changes
Jun 11, 2020
|
@swift-ci please smoke test |
|
@artemcm This will break the swift-driver side test for end-to-end explicit module building. Should we hold on merging this? |
Good call. I'll grab this PR for testing while developing the swift-driver side and will ping you once we can merge them both. 👍 |
Thank you! |
|
@swift-ci please smoke test |
|
@swift-ci please smoke test |
Building each Swift module explicitly requires dependency PCMs to be built with the exactly same deployment target version. This means we may need to build a Clang module multiple times with different target triples. This patch removes the -target arguments from the reported PCM build arguments and inserts extraPcmArgs fields to each Swift module. swift-driver can combine the generic PCM arguments with these extra arguments to get the command suitable for building a PCM specifically for that loading Swift module.
These tests are duplicates of those from swift-driver.
…ents Swift interface files may specify the effective language version to use. When building a PCM loadable for these textual interface files, we should respect the language version. This patch moves -fapinotes-swift-version from the generic PCM commands to the extra PCM arguments owned by each loading Swift module.
|
@swift-ci please smoke test |
|
@artemcm Merged |
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.
Building each Swift module explicitly requires dependency PCMs to be built
with the exactly same deployment target version. This means we may need to
build a Clang module multiple times with different target triples.
This patch removes the -target arguments from the reported PCM build
arguments and inserts extraPcmArgs fields to each Swift module.
swift-driver can combine the generic PCM arguments with these extra arguments
to get the command suitable for building a PCM specifically for
that loading Swift module.