Skip to content

Disable ONLY_ACTIVE_ARCH when --arch is used to request more than one explicitly #9303

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2025
Merged

Disable ONLY_ACTIVE_ARCH when --arch is used to request more than one explicitly #9303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sources/SwiftBuildSupport/SwiftBuildSystem.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

@jakepetroules jakepetroules Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we just always disable this?

Copy link
Contributor Author

@owenv owenv Oct 29, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think if you do a debug build and don't explicitly specify any target/arch we probably shouldn't build universal

)
}

Expand Down
69 changes: 47 additions & 22 deletions Tests/IntegrationTests/SwiftPMTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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))
}
}
}
Expand Down