Fix -fmodule-map-file pointing to non-existent path
#3247
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
neonichu
requested review from
abertelrud,
friedbunny and
tomerd
as code owners
|
@swift-ci please smoke test |
|
Tested locally to verify that this fixes the issue mentioned in #3246 |
yim-lee
added a commit
to yim-lee/swift
that referenced
this pull request
Feb 8, 2021
This is for testing swiftlang/swift-package-manager#3247
abertelrud
reviewed
Feb 8, 2021
yim-lee
approved these changes
Feb 8, 2021
There was a problem hiding this comment.
I verified that this fixes the error I was seeing locally. Need to wait for CI (swiftlang/swift#35202) to see if it fixes the build issue we saw with the source compat suite in swiftlang/swift#35503.
|
We should probably add a test, I was just trying to have a PR up quickly. |
@neonichu looks like a test needs to be updated? |
|
Looks like the test is correct, but the fix isn't. We still need to impart for Swift targets. The only case where we shouldn't is for clang targets with an explicit module map. |
We were passing this unconditionally which would break in the case where we weren't generated a module map because an explicit one exists. rdar://74115399
neonichu
force-pushed
the
only-pass-module-map-explicitly-if-generated
branch
from
af0ad46 to
9a2fdbc
Compare
|
@swift-ci please smoke test |
tomerd
approved these changes
Feb 9, 2021
abertelrud
approved these changes
Feb 9, 2021
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.
We were passing this unconditionally which would break in the case where we weren't generated a module map because an explicit one exists.
rdar://74115399