Do not inherit host destination's extra flags for target destination when cross-compiling #3703
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
kateinoigakukun
requested review from
abertelrud,
friedbunny,
neonichu and
tomerd
as code owners
|
@swift-ci please smoke test |
neonichu
approved these changes
Sep 1, 2021
tomerd
reviewed
Sep 1, 2021
kateinoigakukun
force-pushed
the
katei/drop-invalid-host-specific-args-upstream
branch
from
a09680a to
497f846
Compare
tomerd
reviewed
Sep 2, 2021
Sources/Workspace/Destination.swift
Outdated
| @@ -178,6 +178,24 @@ public struct Destination: Encodable, Equatable { | |||
| } | |||
| /// Cache storage for sdk platform path. | |||
| private static var _sdkPlatformFrameworkPath: (fwk: AbsolutePath, lib: AbsolutePath)? = nil | |||
|
|
|||
| /// Returns a default destination of a given target environment | |||
| public static func defaultDestination(target: Triple, hostDestination: Destination) -> Destination? { | |||
There was a problem hiding this comment.
target has a very specific meaning in SwiftPM, hence my suggestion to label it for. another alternative is to label it triple or targetTriple, tho I think the type already says that its a triple - which is also why labeling hostDestination: Destination is redundant as Destination is already communicated by the type.
There was a problem hiding this comment.
Oh, sorry. I overlooked your comment around labels. I followed defaultDestination(for triple: Triple, host: Destination) -> Destination?
Host environment specific flags, such as XCTest module directory, were implicitly inherited by target destination. It caused unexpected reference to host module file, so drop them explicitly
kateinoigakukun
force-pushed
the
katei/drop-invalid-host-specific-args-upstream
branch
from
497f846 to
0ceb626
Compare
|
@swift-ci please smoke test |
abertelrud
approved these changes
Sep 2, 2021
kateinoigakukun
deleted the
katei/drop-invalid-host-specific-args-upstream
branch
mattt
pushed a commit
to mattt/swift-package-manager
that referenced
this pull request
Sep 16, 2021
…wiftlang#3703) Host environment specific flags, such as XCTest module directory, were implicitly inherited by target destination. It caused unexpected reference to host module file, so drop them explicitly
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.
Do not inherit host destination's extra flags for target destination
Motivation:
Host environment specific flags, such as XCTest module directory, were implicitly inherited by target destination. It caused unexpected reference to host module file when cross-compiling for WASI, so drop them explicitly
Modifications:
Create a new fresh Destination for WASI target and move some logic into Destination to be more generic for different targets.
CC: @MaxDesiatov