From 839328aa476846fd087ab57e6773897831a8566f Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 7 May 2020 11:36:09 +0100 Subject: [PATCH 1/2] Guard planLinuxMain only on Darwin platforms LinuxMain is also used to run tests on WebAssembly/WASI (and potentially on Android, Windows etc) --- Sources/Build/BuildPlan.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Build/BuildPlan.swift b/Sources/Build/BuildPlan.swift index c5b2d835a2c..94f4f46d48d 100644 --- a/Sources/Build/BuildPlan.swift +++ b/Sources/Build/BuildPlan.swift @@ -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 [] } From 6275f82dd04d57e2f86a7158125a499e1a58cdfb Mon Sep 17 00:00:00 2001 From: Max Desiatov Date: Thu, 7 May 2020 11:42:06 +0100 Subject: [PATCH 2/2] Append from linuxMainMap w/ all non-Darwin triples --- Sources/Build/BuildPlan.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Build/BuildPlan.swift b/Sources/Build/BuildPlan.swift index 94f4f46d48d..8cb750b0fee 100644 --- a/Sources/Build/BuildPlan.swift +++ b/Sources/Build/BuildPlan.swift @@ -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) } }