Simplify the paths to module maps generated by the Swift build rules. #560
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
Since we pass these module maps directly to the compiler with `-fmodule-map-file`, we don't need them to be named exactly `module.modulemap`, so the extra subdirectory is also unnecessary. This change also migrates generation of the modulemap file content for the generated header's module to the same code (`module_maps.bzl`) already used by `swift_clang_module_aspect`, instead of having its own separate code path. PiperOrigin-RevId: 354324121 (cherry picked from commit 5f51ca9)
keith
referenced
this pull request
Jan 28, 2021
Since we pass these module maps directly to the compiler with `-fmodule-map-file`, we don't need them to be named exactly `module.modulemap`, so the extra subdirectory is also unnecessary. This change also migrates generation of the modulemap file content for the generated header's module to the same code (`module_maps.bzl`) already used by `swift_clang_module_aspect`, instead of having its own separate code path. PiperOrigin-RevId: 354324121
brentleyjones
approved these changes
Jan 28, 2021
keith
deleted the
ks/simplify-the-paths-to-module-maps-generated-by-the-swift-build-rules
branch
|
The generated module map now reexports all of the imported modules. Is that an intended change? |
|
Oof, it was not, thanks for catching that. I can get a fix out soon if you want to wait and stay in sync with |
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.
Since we pass these module maps directly to the compiler with
-fmodule-map-file, we don't need them to be named exactlymodule.modulemap, so the extra subdirectory is also unnecessary.This change also migrates generation of the modulemap file content for the generated header's module to the same code (
module_maps.bzl) already used byswift_clang_module_aspect, instead of having its own separate code path.PiperOrigin-RevId: 354324121
(cherry picked from commit 5f51ca9)