[ClangImporter] Look for platform modulemaps in the resource dir first#76036
Closed
[ClangImporter] Look for platform modulemaps in the resource dir first#76036
Conversation
This applies #74814 for all targets except Android. This fixes a common source of build failures on Linux, where shim functions from CxxStdlibShim would not be found by the hosttools Swift compiler when building the CxxStdlib overlay. This change is keeping Android intact to keep the existing Android SDK working.
Contributor
Author
|
@swift-ci please test |
finagolfin
reviewed
Aug 22, 2024
| return result; | ||
| // FIXME: This is a workaround to keep the Android SDK build working. | ||
| // See https://github.com/swiftlang/swift/pull/74814. | ||
| if (triple.isAndroid()) { |
Member
There was a problem hiding this comment.
Put this Android block inside a #if defined(_WIN32) || defined(_WIN64), as only The Browser Company's upcoming Android SDK that is only used on Windows and uses a new experimental SDK layout fails with this pull.
Contributor
Author
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This applies #74814 for all targets except Android.
This fixes a common source of build failures on Linux, where shim functions from CxxStdlibShim would not be found by the hosttools Swift compiler when building the CxxStdlib overlay.
This change is keeping Android intact to keep the existing Android SDK working.