[Platform] Simplify glibc.modulemap generation #2311
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
So that we can generate arbitrary output file.
Get rid of cmake configure_file and gyb combination.
|
@modocache Did you filed this on JIRA? I couldn't find that. |
|
@swift-ci Please test and merge |
|
@rintaro Ack, no I did not!! Thank you for the follow-up! |
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?
Follow up on #2081.
CC: @modocache @gribozavr
All
glibc.modulemapconfiguration is done only withgybtool now.Prior to this task, I factored out single gyb processing function in
SwiftHandleGybSources.cmake:handle_gyb_source_single()Small changes in addition:
glibc.modulemapfromstdlibtosdk-overlaybecauseGlibcmodule itself issdk-overlayALLfromadd_custom_targetbecause it's not needed to be.output_file_name_hashvariable fromhandle_gyb_sources.Resolved bug number: (SR-)
Before merging this pull request to apple/swift repository: