Fix dup modmaps taking into account macro test targets. #8524
+105
−73
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
In my previous attempt to fix the duplicate modulemaps from C library dependencies of macros/plugins and destination targets, I didn't take into account test targets depending on macros, i.e. macro tests. In these cases the modulemap flags do need to pass through to the tests. This was discovered in swift-foundation which couldn't find the _SwiftSyntaxCShims module map. Fixed this my moving the traversing link dependencies a layer lower since we need access to the parent node during traversal and this is available in the successor methods. Cleaned up my previous attempt.
dschaefer2
requested review from
bnbarham,
MaxDesiatov,
jakepetroules,
xedin,
shawnhyam,
bripeticca,
plemarquand,
owenv,
bkhouri,
cmcgee1024 and
daveyc123
as code owners
This was referenced Apr 17, 2025
|
@swift-ci please test |
|
@swift-ci please test windows |
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.
In my previous attempt to fix the duplicate modulemaps from C library dependencies of macros/plugins and destination targets, I didn't take into account test targets depending on macros, i.e. macro tests. In these cases the modulemap flags do need to pass through to the tests. This was discovered in swift-foundation which couldn't find the _SwiftSyntaxCShims module map.
Fixed this my moving the traversing link dependencies a layer lower since we need access to the parent node during traversal and this is available in the successor methods. Cleaned up my previous attempt.