From 138a44f8e4f5fef58c3fe511b50f4fbcf9f170c3 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 7 Nov 2025 15:22:42 -0800 Subject: [PATCH] Use the correct build path suffix across all platforms Now it's correct everywhere, not only for macOS, Windows, and Linux. Main motivation was for FreeBSD, and will also work for Android, Wasm, iOS, etc. --- .../BuildParameters/BuildParameters.swift | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Sources/SPMBuildCore/BuildParameters/BuildParameters.swift b/Sources/SPMBuildCore/BuildParameters/BuildParameters.swift index 43bac0c93bf..035f4911c41 100644 --- a/Sources/SPMBuildCore/BuildParameters/BuildParameters.swift +++ b/Sources/SPMBuildCore/BuildParameters/BuildParameters.swift @@ -242,10 +242,14 @@ public struct BuildParameters: Encodable { switch buildSystemKind { case .xcode, .swiftbuild: var configDir: String = configuration.dirname.capitalized - if self.triple.isWindows() { - configDir += "-windows" - } else if self.triple.isLinux() { - configDir += "-linux" + if self.triple.isMacOSX { + // no suffix + } else if self.triple.isAndroid() { + configDir += "-android" + } else if self.triple.isWasm { + configDir += "-webassembly" + } else { + configDir += "-" + (self.triple.darwinPlatform?.platformName ?? self.triple.osNameUnversioned) } return dataPath.appending(components: "Products", configDir) case .native: