[Platform] Unify Linux/FreeBSD modulemaps with gyb #2081
Merged
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
Merged
| @@ -362,10 +363,12 @@ module SwiftGlibc [system] { | |||
| header "@GLIBC_INCLUDE_PATH@/utmpx.h" | |||
| export * | |||
| } | |||
| % if CMAKE_SDK != "FREEBSD": | |||
There was a problem hiding this comment.
Negative tests are fragile and frustrating to read when porting to a new platform. Could you change these if statements to use comparisons like CMAKE_SDK in ['LINUX', 'ANDROID']?
|
Thank you! LGTM modulo comments. Let's get feedback from the CI: |
|
The OS X failure appears to be unrelated. |
modocache
force-pushed
the
glibc-modulemap-gyb
branch
from
5477d09 to
89bb467
Compare
A great deal of duplication exists across the Linux and FreeBSD modulemaps. An Android modulemap would add even more duplication. Use gyb to conditionally include certain exports for certain platforms. Most of glibc.modulemap is common across Linux and FreeBSD, and using gyb we can conditionally include the two exports that differ.
modocache
force-pushed
the
glibc-modulemap-gyb
branch
from
89bb467 to
1fbdaee
Compare
|
@swift-ci Please test and merge |
|
CI failures are unrelated. |
1 task
MaxDesiatov
pushed a commit
that referenced
this pull request
Apr 19, 2021
Remove sed backup file from toolchain
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.
What's in this pull request?
A great deal of duplication exists across the Linux and FreeBSD modulemaps. An Android modulemap would add even more duplication.
Use gyb to conditionally include certain exports for certain platforms. Most of glibc.modulemap is common across Linux and FreeBSD, and using gyb we can conditionally include the two exports that differ.
Resolved bug number: #1442 (comment)
Before merging this pull request to apple/swift repository:
Triggering Swift CI
The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:
Smoke Testing
Validation Testing
Note: Only members of the Apple organization can trigger swift-ci.