From 099248c8e6b7079bbf041c103a4e7055bb5376d0 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 11 Nov 2025 17:13:08 -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 4f45f7de9b2..e5d9802b79f 100644 --- a/Sources/SPMBuildCore/BuildParameters/BuildParameters.swift +++ b/Sources/SPMBuildCore/BuildParameters/BuildParameters.swift @@ -247,10 +247,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: