build: repair build after apple/swift-tools-support-core#117 #2885
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
compnerd
requested review from
abertelrud,
aciidgh,
friedbunny and
neonichu
as code owners
|
@swift-ci please test |
|
@swift-ci please smoke test |
compnerd
force-pushed
the
compnerd-triple
branch
from
f4d54c3 to
2077fc2
Compare
|
@swift-ci please smoke test |
compnerd
force-pushed
the
compnerd-triple
branch
from
2077fc2 to
6a30246
Compare
|
@swift-ci please smoke test |
abertelrud
approved these changes
Aug 25, 2020
There was a problem hiding this comment.
Thanks! Looks good to me, but @neonichu might be in a better position to review.
compnerd
force-pushed
the
compnerd-triple
branch
from
6a30246 to
69dcb95
Compare
|
@swift-ci please smoke test |
compnerd
force-pushed
the
compnerd-triple
branch
from
69dcb95 to
577cf04
Compare
|
@swift-ci please smoke test |
compnerd
force-pushed
the
compnerd-triple
branch
from
577cf04 to
0a59454
Compare
|
@swift-ci please smoke test |
1 similar comment
|
@swift-ci please smoke test |
|
@swift-ci please test |
|
I was planning to fix this in #2883, but ran out of time yesterday. |
Remove Triple.swift as tools-support-core now has this defined.
```
/Users/buildnode/jenkins/workspace/swift-package-manager-with-xcode-self-hosted-PR-osx/branch-master/swiftpm/Sources/Build/BuildPlan.swift:1896:23: error: 'Triple' is ambiguous for type lookup in this context
fileprivate extension Triple.OS {
^~~~~~
/Users/buildnode/jenkins/workspace/swift-package-manager-with-xcode-self-hosted-PR-osx/branch-master/swiftpm/.build/checkouts/swift-tools-support-core/Sources/TSCUtility/Triple.swift:21:15: note: found this candidate
public struct Triple: Encodable, Equatable {
^
/Users/buildnode/jenkins/workspace/swift-package-manager-with-xcode-self-hosted-PR-osx/branch-master/swiftpm/Sources/SPMBuildCore/Triple.swift:21:15: note: found this candidate
public struct Triple: Encodable, Equatable {
^
```
compnerd
force-pushed
the
compnerd-triple
branch
from
0a59454 to
03feba7
Compare
|
@swift-ci please smoke test |
|
I think this is superseded by #2883 now. |
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.
Remove
Triple.swiftas tools-support-core now has this defined. This repairs the CMake based build.