From 9d7d08f95721df4f1767547443b664278b2d006d Mon Sep 17 00:00:00 2001
From: Owen Voorhees <ovoorhees@apple.com>
Date: Tue, 28 Oct 2025 17:04:05 -0700
Subject: [PATCH] Disable ONLY_ACTIVE_ARCH when --arch is used to request more
 than one explicitly

---
 .../SwiftBuildSupport/SwiftBuildSystem.swift  |  2 +-
 Tests/IntegrationTests/SwiftPMTests.swift     | 69 +++++++++++++------
 2 files changed, 48 insertions(+), 23 deletions(-)

diff --git a/Sources/SwiftBuildSupport/SwiftBuildSystem.swift b/Sources/SwiftBuildSupport/SwiftBuildSystem.swift
index 1d6597b5463..a0d710c29bc 100644
--- a/Sources/SwiftBuildSupport/SwiftBuildSystem.swift
+++ b/Sources/SwiftBuildSupport/SwiftBuildSystem.swift
@@ -842,7 +842,7 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem {
             sdkVariant: sdkVariant,
             targetArchitecture: buildParameters.triple.archName,
             supportedArchitectures: [],
-            disableOnlyActiveArch: false
+            disableOnlyActiveArch: (buildParameters.architectures?.count ?? 1) > 1
         )
     }
 
diff --git a/Tests/IntegrationTests/SwiftPMTests.swift b/Tests/IntegrationTests/SwiftPMTests.swift
index c2fd11b8666..d8298a097d5 100644
--- a/Tests/IntegrationTests/SwiftPMTests.swift
+++ b/Tests/IntegrationTests/SwiftPMTests.swift
@@ -158,15 +158,15 @@ private struct SwiftPMTests {
         }
     }
 
-    @Test(.requireHostOS(.macOS))
-    func testArchCustomization() async throws {
+    @Test(.requireHostOS(.macOS), arguments: [BuildSystemProvider.Kind.native, .swiftbuild])
+    func testArchCustomization(buildSystem: BuildSystemProvider.Kind) async throws {
         try await  withTemporaryDirectory { tmpDir in
             let packagePath = tmpDir.appending(component: "foo")
             try localFileSystem.createDirectory(packagePath)
             try await executeSwiftPackage(
                 packagePath,
                 extraArgs: ["init", "--type", "executable"],
-                buildSystem: .native,
+                buildSystem: buildSystem,
             )
             // delete any files generated
             for entry in try localFileSystem.getDirectoryContents(
@@ -187,36 +187,61 @@ private struct SwiftPMTests {
                 try await executeSwiftBuild(
                     packagePath,
                     extraArgs: ["--arch", arch],
-                    buildSystem: .native,
-                )
-                let fooPath = try AbsolutePath(
-                    validating: ".build/\(arch)-apple-macosx/debug/foo",
-                    relativeTo: packagePath
+                    buildSystem: buildSystem,
                 )
+                let fooPath: AbsolutePath
+                switch buildSystem {
+                case .native:
+                    fooPath = try AbsolutePath(
+                        validating: ".build/\(arch)-apple-macosx/debug/foo",
+                        relativeTo: packagePath
+                    )
+                case .swiftbuild:
+                    fooPath = try AbsolutePath(
+                        validating: ".build/\(arch)-apple-macosx/Products/Debug/foo",
+                        relativeTo: packagePath
+                    )
+                default:
+                    preconditionFailure("Unsupported backend: \(buildSystem)")
+                }
                 #expect(localFileSystem.exists(fooPath))
+                // Check the product has the expected slice
+                #expect(try sh("/usr/bin/file", fooPath.pathString).stdout.contains(arch))
             }
 
-            // let args =
-            //     [swiftBuild.pathString, "--package-path", packagePath.pathString]
-            //         + archs.flatMap { ["--arch", $0] }
             try await executeSwiftBuild(
                 packagePath,
                 extraArgs: archs.flatMap { ["--arch", $0] },
-                buildSystem: .native,
+                buildSystem: buildSystem,
             )
 
-            let fooPath = try AbsolutePath(
-                validating: ".build/apple/Products/Debug/foo", relativeTo: packagePath
-            )
+            let fooPath: AbsolutePath
+            let hostArch: String
+            #if arch(x86_64)
+            hostArch = "x86_64"
+            #elseif arch(arm64)
+            hostArch = "arm64"
+            #else
+            precondition("Unsupported platform or host arch for test")
+            #endif
+            switch buildSystem {
+            case .native:
+                fooPath = try AbsolutePath(
+                    validating: ".build/apple/Products/Debug/foo", relativeTo: packagePath
+                )
+            case .swiftbuild:
+                fooPath = try AbsolutePath(
+                    validating: ".build/\(hostArch)-apple-macosx/Products/Debug/foo",
+                    relativeTo: packagePath
+                )
+            default:
+                preconditionFailure("Unsupported backend: \(buildSystem)")
+            }
             #expect(localFileSystem.exists(fooPath))
-
-            let objectsDir = try AbsolutePath(
-                validating:
-                ".build/apple/Intermediates.noindex/foo.build/Debug/foo.build/Objects-normal",
-                relativeTo: packagePath
-            )
+            // Check the product has the expected slices
+            let fileOutput = try sh("/usr/bin/file", fooPath.pathString).stdout
             for arch in archs {
-                #expect(localFileSystem.isDirectory(objectsDir.appending(component: arch)))
+                #expect(fileOutput.contains(arch))
             }
         }
     }