Skip to content

Commit 2077fc2

Browse files
committed
build: repair build after swiftlang/swift-tools-support-core#117
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 { ^ ```
1 parent 6d93142 commit 2077fc2

File tree

2 files changed

+1
-213
lines changed

2 files changed

+1
-213
lines changed

Sources/SPMBuildCore/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ add_library(SPMBuildCore
1111
BuildSystem.swift
1212
BuiltTestProduct.swift
1313
Sanitizers.swift
14-
Toolchain.swift
15-
Triple.swift)
14+
Toolchain.swift)
1615
# NOTE(compnerd) workaround for CMake not setting up include flags yet
1716
set_target_properties(SPMBuildCore PROPERTIES
1817
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})

Sources/SPMBuildCore/Triple.swift

Lines changed: 0 additions & 211 deletions
This file was deleted.

0 commit comments

Comments
 (0)