Skip to content

Use LinuxMain on all platforms except Darwin #2734

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 2 commits into from
May 11, 2020
Merged

Use LinuxMain on all platforms except Darwin #2734

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
839328a
Guard planLinuxMain only on Darwin platforms
MaxDesiatov May 7, 2020
6275f82
Append from linuxMainMap w/ all non-Darwin triples
MaxDesiatov May 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Sources/Build/BuildPlan.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,7 +1207,7 @@ public class BuildPlan {
_ buildParameters: BuildParameters,
_ graph: PackageGraph
) throws -> [(ResolvedProduct, SwiftTargetBuildDescription)] {
guard buildParameters.triple.isLinux() else {
guard !buildParameters.triple.isDarwin() else {
return []
}

Expand Down Expand Up @@ -1532,7 +1532,7 @@ public class BuildPlan {
}
}

if buildParameters.triple.isLinux() {
if !buildParameters.triple.isDarwin() {
if product.type == .test {
linuxMainMap[product].map{ staticTargets.append($0) }
}
Expand Down