[cxx-interop] Hook libcxxshim modulemap/header to sdk-overlay #62475
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
The modulemap and header files target was added to `ALL`, which works when invoking the build thru the `build-script`, but make some test fail when doing a manual configuration and later doing `check-swift-validation` or similar, because the modulemap/header were not copied into the build directory. Follow a pattern similar to the one in GlibC (which this file seemed to be prepared for, since the `libcxxshim_modulemap_target_list` variable was already there), create a global target for all the modulemap/headers of each SDK and add that global target as a dependency of sdk-overlay (which is a dependency of check-swift-validation and others).
|
@swift-ci please test |
quinntaylor
pushed a commit
to quinntaylor/swift
that referenced
this pull request
Dec 12, 2022
…ang#62475) The modulemap and header files target was added to `ALL`, which works when invoking the build thru the `build-script`, but make some test fail when doing a manual configuration and later doing `check-swift-validation` or similar, because the modulemap/header were not copied into the build directory. Follow a pattern similar to the one in GlibC (which this file seemed to be prepared for, since the `libcxxshim_modulemap_target_list` variable was already there), create a global target for all the modulemap/headers of each SDK and add that global target as a dependency of sdk-overlay (which is a dependency of check-swift-validation and others).
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.
The modulemap and header files target was added to
ALL, which works when invoking the build thru thebuild-script, but make some test fail when doing a manual configuration and later doingcheck-swift-validationor similar, because the modulemap/header were not copied into the build directory.Follow a pattern similar to the one in GlibC (which this file seemed to be prepared for, since the
libcxxshim_modulemap_target_listvariable was already there), create a global target for all the modulemap/headers of each SDK and add that global target as a dependency of sdk-overlay (which is a dependency of check-swift-validation and others).